scsi: smartpqi: make pdev pointer names consistent

make all variable names for pointers to struct pci_dev consistent
throughout the driver.

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit d91d7820d39629fc67cea5d6721eac8b180b0451)

Orabug: 26943380

Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
 Conflicts:
	drivers/scsi/smartpqi/smartpqi_init.c

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index d7220faba1d80230f5bd74abb95866d6171fae2a..f28ecba9f3ca8488b8079e66ed9a7fc64e2b7e18 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -6529,7 +6529,6 @@ static void pqi_remove_ctrl(struct pqi_ctrl_info *ctrl_info)
        pqi_free_ctrl_resources(ctrl_info);
 }
 
-
 static void pqi_perform_lockup_action(void)
 {
        switch (pqi_lockup_action) {
@@ -6611,7 +6610,7 @@ static void pqi_take_ctrl_offline(struct pqi_ctrl_info *ctrl_info)
        schedule_work(&ctrl_info->ctrl_offline_work);
 }
 
-static void pqi_print_ctrl_info(struct pci_dev *pdev,
+static void pqi_print_ctrl_info(struct pci_dev *pci_dev,
        const struct pci_device_id *id)
 {
        char *ctrl_description;
@@ -6621,41 +6620,42 @@ static void pqi_print_ctrl_info(struct pci_dev *pdev,
        else
                ctrl_description = "Microsemi Smart Family Controller";
 
-       dev_info(&pdev->dev, "%s found\n", ctrl_description);
+       dev_info(&pci_dev->dev, "%s found\n", ctrl_description);
 }
 
-static int pqi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+static int pqi_pci_probe(struct pci_dev *pci_dev,
+       const struct pci_device_id *id)
 {
        int rc;
        int node;
        struct pqi_ctrl_info *ctrl_info;
 
-       pqi_print_ctrl_info(pdev, id);
+       pqi_print_ctrl_info(pci_dev, id);
 
        if (pqi_disable_device_id_wildcards &&
                id->subvendor == PCI_ANY_ID &&
                id->subdevice == PCI_ANY_ID) {
-               dev_warn(&pdev->dev,
+               dev_warn(&pci_dev->dev,
                        "controller not probed because device ID wildcards are disabled\n");
                return -ENODEV;
        }
 
        if (id->subvendor == PCI_ANY_ID || id->subdevice == PCI_ANY_ID)
-               dev_warn(&pdev->dev,
+               dev_warn(&pci_dev->dev,
                        "controller device ID matched using wildcards\n");
 
-       node = dev_to_node(&pdev->dev);
+       node = dev_to_node(&pci_dev->dev);
        if (node == NUMA_NO_NODE)
-               set_dev_node(&pdev->dev, 0);
+               set_dev_node(&pci_dev->dev, 0);
 
        ctrl_info = pqi_alloc_ctrl_info(node);
        if (!ctrl_info) {
-               dev_err(&pdev->dev,
+               dev_err(&pci_dev->dev,
                        "failed to allocate controller info block\n");
                return -ENOMEM;
        }
 
-       ctrl_info->pci_dev = pdev;
+       ctrl_info->pci_dev = pci_dev;
 
        rc = pqi_pci_init(ctrl_info);
        if (rc)
@@ -6673,23 +6673,23 @@ error:
        return rc;
 }
 
-static void pqi_pci_remove(struct pci_dev *pdev)
+static void pqi_pci_remove(struct pci_dev *pci_dev)
 {
        struct pqi_ctrl_info *ctrl_info;
 
-       ctrl_info = pci_get_drvdata(pdev);
+       ctrl_info = pci_get_drvdata(pci_dev);
        if (!ctrl_info)
                return;
 
        pqi_remove_ctrl(ctrl_info);
 }
 
-static void pqi_shutdown(struct pci_dev *pdev)
+static void pqi_shutdown(struct pci_dev *pci_dev)
 {
        int rc;
        struct pqi_ctrl_info *ctrl_info;
 
-       ctrl_info = pci_get_drvdata(pdev);
+       ctrl_info = pci_get_drvdata(pci_dev);
        if (!ctrl_info)
                goto error;
 
@@ -6702,7 +6702,7 @@ static void pqi_shutdown(struct pci_dev *pdev)
                return;
 
 error:
-       dev_warn(&pdev->dev,
+       dev_warn(&pci_dev->dev,
                "unable to flush controller cache\n");
 }