OSDN Git Service

scsi: smartpqi: Rename pciinfo to pci_info
authorKevin Barnett <kevin.barnett@microchip.com>
Thu, 24 Aug 2023 15:58:07 +0000 (10:58 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 25 Aug 2023 02:54:21 +0000 (22:54 -0400)
Make pci device structure names consistent and readable.

Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
Reviewed-by: Mike McGowen <mike.mcgowen@microchip.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microchip.com>
Signed-off-by: Don Brace <don.brace@microchip.com>
Link: https://lore.kernel.org/r/20230824155812.789913-4-don.brace@microchip.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/smartpqi/smartpqi_init.c

index 97322eb..2ebc722 100644 (file)
@@ -6570,21 +6570,21 @@ static int pqi_getpciinfo_ioctl(struct pqi_ctrl_info *ctrl_info, void __user *ar
        struct pci_dev *pci_dev;
        u32 subsystem_vendor;
        u32 subsystem_device;
-       cciss_pci_info_struct pciinfo;
+       cciss_pci_info_struct pci_info;
 
        if (!arg)
                return -EINVAL;
 
        pci_dev = ctrl_info->pci_dev;
 
-       pciinfo.domain = pci_domain_nr(pci_dev->bus);
-       pciinfo.bus = pci_dev->bus->number;
-       pciinfo.dev_fn = pci_dev->devfn;
+       pci_info.domain = pci_domain_nr(pci_dev->bus);
+       pci_info.bus = pci_dev->bus->number;
+       pci_info.dev_fn = pci_dev->devfn;
        subsystem_vendor = pci_dev->subsystem_vendor;
        subsystem_device = pci_dev->subsystem_device;
-       pciinfo.board_id = ((subsystem_device << 16) & 0xffff0000) | subsystem_vendor;
+       pci_info.board_id = ((subsystem_device << 16) & 0xffff0000) | subsystem_vendor;
 
-       if (copy_to_user(arg, &pciinfo, sizeof(pciinfo)))
+       if (copy_to_user(arg, &pci_info, sizeof(pci_info)))
                return -EFAULT;
 
        return 0;