Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4695a1ad authored by Romain Perier's avatar Romain Perier Committed by Bjorn Helgaas
Browse files

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: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
Signed-off-by: default avatarRomain Perier <romain.perier@collabora.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
parent b19ed63c

drivers/block/DAC960.c

+18 −20
Original line number Diff line number Diff line
@@ -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) {
@@ -437,13 +437,11 @@ static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller) 
      Controller->CurrentStatusBuffer = NULL;

    }



  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]);

drivers/block/DAC960.h

+2 −2
Original line number Diff line number Diff line
@@ -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;