On Wed, Feb 08, 2017 at 05:34:39PM +0100, Romain Perier wrote: > The PCI pool API is deprecated. This commits replaces the PCI pool old > API by the appropriated function with the DMA pool API. > > Signed-off-by: Romain Perier <romain.per...@collabora.com>
Tested by compilation only. Some whitespace errors, but the patch do not add new ones. Acked-by: Peter Senna Tschudin <peter.se...@collabora.com> Tested-by: Peter Senna Tschudin <peter.se...@collabora.com> > --- > drivers/block/DAC960.c | 36 ++++++++++++++++++------------------ > drivers/block/DAC960.h | 4 ++-- > 2 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c > index 26a51be..2b221cc 100644 > --- a/drivers/block/DAC960.c > +++ b/drivers/block/DAC960.c > @@ -268,17 +268,17 @@ static bool > DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) > void *AllocationPointer = NULL; > void *ScatterGatherCPU = NULL; > dma_addr_t ScatterGatherDMA; > - struct pci_pool *ScatterGatherPool; > + struct dma_pool *ScatterGatherPool; > void *RequestSenseCPU = NULL; > dma_addr_t RequestSenseDMA; > - struct pci_pool *RequestSensePool = NULL; > + struct dma_pool *RequestSensePool = NULL; > > if (Controller->FirmwareType == DAC960_V1_Controller) > { > CommandAllocationLength = offsetof(DAC960_Command_T, V1.EndMarker); > CommandAllocationGroupSize = DAC960_V1_CommandAllocationGroupSize; > - ScatterGatherPool = pci_pool_create("DAC960_V1_ScatterGather", > - Controller->PCIDevice, > + ScatterGatherPool = dma_pool_create("DAC960_V1_ScatterGather", > + &Controller->PCIDevice->dev, > DAC960_V1_ScatterGatherLimit * sizeof(DAC960_V1_ScatterGatherSegment_T), > sizeof(DAC960_V1_ScatterGatherSegment_T), 0); > if (ScatterGatherPool == NULL) > @@ -290,18 +290,18 @@ static bool > DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) > { > CommandAllocationLength = offsetof(DAC960_Command_T, V2.EndMarker); > CommandAllocationGroupSize = DAC960_V2_CommandAllocationGroupSize; > - ScatterGatherPool = pci_pool_create("DAC960_V2_ScatterGather", > - Controller->PCIDevice, > + ScatterGatherPool = dma_pool_create("DAC960_V2_ScatterGather", > + &Controller->PCIDevice->dev, > DAC960_V2_ScatterGatherLimit * sizeof(DAC960_V2_ScatterGatherSegment_T), > sizeof(DAC960_V2_ScatterGatherSegment_T), 0); > if (ScatterGatherPool == NULL) > return DAC960_Failure(Controller, > "AUXILIARY STRUCTURE CREATION (SG)"); > - RequestSensePool = pci_pool_create("DAC960_V2_RequestSense", > - Controller->PCIDevice, sizeof(DAC960_SCSI_RequestSense_T), > + RequestSensePool = dma_pool_create("DAC960_V2_RequestSense", > + &Controller->PCIDevice->dev, sizeof(DAC960_SCSI_RequestSense_T), > sizeof(int), 0); > if (RequestSensePool == NULL) { > - pci_pool_destroy(ScatterGatherPool); > + dma_pool_destroy(ScatterGatherPool); > return DAC960_Failure(Controller, > "AUXILIARY STRUCTURE CREATION (SG)"); > } > @@ -335,16 +335,16 @@ static bool > DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) > Command->Next = Controller->FreeCommands; > Controller->FreeCommands = Command; > Controller->Commands[CommandIdentifier-1] = Command; > - ScatterGatherCPU = pci_pool_alloc(ScatterGatherPool, GFP_ATOMIC, > + ScatterGatherCPU = dma_pool_alloc(ScatterGatherPool, GFP_ATOMIC, > &ScatterGatherDMA); > if (ScatterGatherCPU == NULL) > return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION"); > > if (RequestSensePool != NULL) { > - RequestSenseCPU = pci_pool_alloc(RequestSensePool, GFP_ATOMIC, > + RequestSenseCPU = dma_pool_alloc(RequestSensePool, GFP_ATOMIC, > &RequestSenseDMA); > if (RequestSenseCPU == NULL) { > - pci_pool_free(ScatterGatherPool, ScatterGatherCPU, > + dma_pool_free(ScatterGatherPool, ScatterGatherCPU, > ScatterGatherDMA); > return DAC960_Failure(Controller, > "AUXILIARY STRUCTURE CREATION"); > @@ -379,8 +379,8 @@ static bool > DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) > static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T > *Controller) > { > int i; > - struct pci_pool *ScatterGatherPool = Controller->ScatterGatherPool; > - struct pci_pool *RequestSensePool = NULL; > + struct dma_pool *ScatterGatherPool = Controller->ScatterGatherPool; > + struct dma_pool *RequestSensePool = NULL; > void *ScatterGatherCPU; > dma_addr_t ScatterGatherDMA; > void *RequestSenseCPU; > @@ -411,9 +411,9 @@ static void > DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller) > RequestSenseDMA = Command->V2.RequestSenseDMA; > } > if (ScatterGatherCPU != NULL) > - pci_pool_free(ScatterGatherPool, ScatterGatherCPU, > ScatterGatherDMA); > + dma_pool_free(ScatterGatherPool, ScatterGatherCPU, > ScatterGatherDMA); > if (RequestSenseCPU != NULL) > - pci_pool_free(RequestSensePool, RequestSenseCPU, RequestSenseDMA); > + dma_pool_free(RequestSensePool, RequestSenseCPU, RequestSenseDMA); > > if ((Command->CommandIdentifier > % Controller->CommandAllocationGroupSize) == 1) { > @@ -438,12 +438,12 @@ static void > DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller) > } > > if (ScatterGatherPool != NULL) > - pci_pool_destroy(ScatterGatherPool); > + dma_pool_destroy(ScatterGatherPool); > if (Controller->FirmwareType == DAC960_V1_Controller) > return; > > if (RequestSensePool != NULL) > - pci_pool_destroy(RequestSensePool); > + dma_pool_destroy(RequestSensePool); > > for (i = 0; i < DAC960_MaxLogicalDrives; i++) { > kfree(Controller->V2.LogicalDeviceInformation[i]); > diff --git a/drivers/block/DAC960.h b/drivers/block/DAC960.h > index 85fa9bb..47d7d69 100644 > --- a/drivers/block/DAC960.h > +++ b/drivers/block/DAC960.h > @@ -2316,7 +2316,7 @@ typedef struct DAC960_Controller > bool SuppressEnclosureMessages; > struct timer_list MonitoringTimer; > struct gendisk *disks[DAC960_MaxLogicalDrives]; > - struct pci_pool *ScatterGatherPool; > + struct dma_pool *ScatterGatherPool; > DAC960_Command_T *FreeCommands; > unsigned char *CombinedStatusBuffer; > unsigned char *CurrentStatusBuffer; > @@ -2429,7 +2429,7 @@ typedef struct DAC960_Controller > bool NeedDeviceSerialNumberInformation; > bool StartLogicalDeviceInformationScan; > bool StartPhysicalDeviceInformationScan; > - struct pci_pool *RequestSensePool; > + struct dma_pool *RequestSensePool; > > dma_addr_t FirstCommandMailboxDMA; > DAC960_V2_CommandMailbox_T *FirstCommandMailbox; > -- > 2.9.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html