openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: DAC960: Replace PCI pool old API 

The PCI pool API is deprecated.  Replace the PCI pool old API by the
appropriate function with the DMA pool API.

Tested-by: Peter Senna Tschudin <peter.senna@collabora.com>
Signed-off-by: Romain Perier <romain.perier@collabora.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Peter Senna Tschudin <peter.senna@collabora.com>
This commit is contained in:
Romain Perier 2018-01-02 18:53:53 +01:00 committed by Bjorn Helgaas
parent b19ed63cbc
commit 4695a1ad3a
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/block/DAC960.c
View File

@ -268,17 +268,17 @@ static bool DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller)
void *AllocationPointer = NULL; void *AllocationPointer = NULL;
void *ScatterGatherCPU = NULL; void *ScatterGatherCPU = NULL;
dma_addr_t ScatterGatherDMA; dma_addr_t ScatterGatherDMA;
struct pci_pool *ScatterGatherPool; struct dma_pool *ScatterGatherPool;
void *RequestSenseCPU = NULL; void *RequestSenseCPU = NULL;
dma_addr_t RequestSenseDMA; dma_addr_t RequestSenseDMA;
struct pci_pool *RequestSensePool = NULL; struct dma_pool *RequestSensePool = NULL;
if (Controller->FirmwareType == DAC960_V1_Controller) if (Controller->FirmwareType == DAC960_V1_Controller)
{ {
CommandAllocationLength = offsetof(DAC960_Command_T, V1.EndMarker); CommandAllocationLength = offsetof(DAC960_Command_T, V1.EndMarker);
CommandAllocationGroupSize = DAC960_V1_CommandAllocationGroupSize; CommandAllocationGroupSize = DAC960_V1_CommandAllocationGroupSize;
ScatterGatherPool = pci_pool_create("DAC960_V1_ScatterGather", ScatterGatherPool = dma_pool_create("DAC960_V1_ScatterGather",
Controller->PCIDevice, &Controller->PCIDevice->dev,
DAC960_V1_ScatterGatherLimit * sizeof(DAC960_V1_ScatterGatherSegment_T), DAC960_V1_ScatterGatherLimit * sizeof(DAC960_V1_ScatterGatherSegment_T),
sizeof(DAC960_V1_ScatterGatherSegment_T), 0); sizeof(DAC960_V1_ScatterGatherSegment_T), 0);
if (ScatterGatherPool == NULL) if (ScatterGatherPool == NULL)
@ -290,18 +290,18 @@ static bool DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller)
{ {
CommandAllocationLength = offsetof(DAC960_Command_T, V2.EndMarker); CommandAllocationLength = offsetof(DAC960_Command_T, V2.EndMarker);
CommandAllocationGroupSize = DAC960_V2_CommandAllocationGroupSize; CommandAllocationGroupSize = DAC960_V2_CommandAllocationGroupSize;
ScatterGatherPool = pci_pool_create("DAC960_V2_ScatterGather", ScatterGatherPool = dma_pool_create("DAC960_V2_ScatterGather",
Controller->PCIDevice, &Controller->PCIDevice->dev,
DAC960_V2_ScatterGatherLimit * sizeof(DAC960_V2_ScatterGatherSegment_T), DAC960_V2_ScatterGatherLimit * sizeof(DAC960_V2_ScatterGatherSegment_T),
sizeof(DAC960_V2_ScatterGatherSegment_T), 0); sizeof(DAC960_V2_ScatterGatherSegment_T), 0);
if (ScatterGatherPool == NULL) if (ScatterGatherPool == NULL)
return DAC960_Failure(Controller, return DAC960_Failure(Controller,
"AUXILIARY STRUCTURE CREATION (SG)"); "AUXILIARY STRUCTURE CREATION (SG)");
RequestSensePool = pci_pool_create("DAC960_V2_RequestSense", RequestSensePool = dma_pool_create("DAC960_V2_RequestSense",
Controller->PCIDevice, sizeof(DAC960_SCSI_RequestSense_T), &Controller->PCIDevice->dev, sizeof(DAC960_SCSI_RequestSense_T),
sizeof(int), 0); sizeof(int), 0);
if (RequestSensePool == NULL) { if (RequestSensePool == NULL) {
pci_pool_destroy(ScatterGatherPool); dma_pool_destroy(ScatterGatherPool);
return DAC960_Failure(Controller, return DAC960_Failure(Controller,
"AUXILIARY STRUCTURE CREATION (SG)"); "AUXILIARY STRUCTURE CREATION (SG)");
} }
@ -335,16 +335,16 @@ static bool DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller)
Command->Next = Controller->FreeCommands; Command->Next = Controller->FreeCommands;
Controller->FreeCommands = Command; Controller->FreeCommands = Command;
Controller->Commands[CommandIdentifier-1] = Command; Controller->Commands[CommandIdentifier-1] = Command;
ScatterGatherCPU = pci_pool_alloc(ScatterGatherPool, GFP_ATOMIC, ScatterGatherCPU = dma_pool_alloc(ScatterGatherPool, GFP_ATOMIC,
&ScatterGatherDMA); &ScatterGatherDMA);
if (ScatterGatherCPU == NULL) if (ScatterGatherCPU == NULL)
return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION"); return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION");
if (RequestSensePool != NULL) { if (RequestSensePool != NULL) {
RequestSenseCPU = pci_pool_alloc(RequestSensePool, GFP_ATOMIC, RequestSenseCPU = dma_pool_alloc(RequestSensePool, GFP_ATOMIC,
&RequestSenseDMA); &RequestSenseDMA);
if (RequestSenseCPU == NULL) { if (RequestSenseCPU == NULL) {
pci_pool_free(ScatterGatherPool, ScatterGatherCPU, dma_pool_free(ScatterGatherPool, ScatterGatherCPU,
ScatterGatherDMA); ScatterGatherDMA);
return DAC960_Failure(Controller, return DAC960_Failure(Controller,
"AUXILIARY STRUCTURE CREATION"); "AUXILIARY STRUCTURE CREATION");
@ -379,8 +379,8 @@ static bool DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller)
static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller) static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller)
{ {
int i; int i;
struct pci_pool *ScatterGatherPool = Controller->ScatterGatherPool; struct dma_pool *ScatterGatherPool = Controller->ScatterGatherPool;
struct pci_pool *RequestSensePool = NULL; struct dma_pool *RequestSensePool = NULL;
void *ScatterGatherCPU; void *ScatterGatherCPU;
dma_addr_t ScatterGatherDMA; dma_addr_t ScatterGatherDMA;
void *RequestSenseCPU; void *RequestSenseCPU;
@ -411,9 +411,9 @@ static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller)
RequestSenseDMA = Command->V2.RequestSenseDMA; RequestSenseDMA = Command->V2.RequestSenseDMA;
} }
if (ScatterGatherCPU != NULL) if (ScatterGatherCPU != NULL)
pci_pool_free(ScatterGatherPool, ScatterGatherCPU, ScatterGatherDMA); dma_pool_free(ScatterGatherPool, ScatterGatherCPU, ScatterGatherDMA);
if (RequestSenseCPU != NULL) if (RequestSenseCPU != NULL)
pci_pool_free(RequestSensePool, RequestSenseCPU, RequestSenseDMA); dma_pool_free(RequestSensePool, RequestSenseCPU, RequestSenseDMA);
if ((Command->CommandIdentifier if ((Command->CommandIdentifier
% Controller->CommandAllocationGroupSize) == 1) { % Controller->CommandAllocationGroupSize) == 1) {
@ -437,13 +437,11 @@ static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller)
Controller->CurrentStatusBuffer = NULL; Controller->CurrentStatusBuffer = NULL;
} }
if (ScatterGatherPool != NULL) dma_pool_destroy(ScatterGatherPool);
pci_pool_destroy(ScatterGatherPool);
if (Controller->FirmwareType == DAC960_V1_Controller) if (Controller->FirmwareType == DAC960_V1_Controller)
return; return;
if (RequestSensePool != NULL) dma_pool_destroy(RequestSensePool);
pci_pool_destroy(RequestSensePool);
for (i = 0; i < DAC960_MaxLogicalDrives; i++) { for (i = 0; i < DAC960_MaxLogicalDrives; i++) {
kfree(Controller->V2.LogicalDeviceInformation[i]); kfree(Controller->V2.LogicalDeviceInformation[i]);

4
drivers/block/DAC960.h
View File

@ -2316,7 +2316,7 @@ typedef struct DAC960_Controller
bool SuppressEnclosureMessages; bool SuppressEnclosureMessages;
struct timer_list MonitoringTimer; struct timer_list MonitoringTimer;
struct gendisk *disks[DAC960_MaxLogicalDrives]; struct gendisk *disks[DAC960_MaxLogicalDrives];
struct pci_pool *ScatterGatherPool; struct dma_pool *ScatterGatherPool;
DAC960_Command_T *FreeCommands; DAC960_Command_T *FreeCommands;
unsigned char *CombinedStatusBuffer; unsigned char *CombinedStatusBuffer;
unsigned char *CurrentStatusBuffer; unsigned char *CurrentStatusBuffer;
@ -2429,7 +2429,7 @@ typedef struct DAC960_Controller
bool NeedDeviceSerialNumberInformation; bool NeedDeviceSerialNumberInformation;
bool StartLogicalDeviceInformationScan; bool StartLogicalDeviceInformationScan;
bool StartPhysicalDeviceInformationScan; bool StartPhysicalDeviceInformationScan;
struct pci_pool *RequestSensePool; struct dma_pool *RequestSensePool;
dma_addr_t FirstCommandMailboxDMA; dma_addr_t FirstCommandMailboxDMA;
DAC960_V2_CommandMailbox_T *FirstCommandMailbox; DAC960_V2_CommandMailbox_T *FirstCommandMailbox;