From: Zheng Zengkai Date: Fri, 11 Aug 2023 11:13:10 +0000 (+0800) Subject: scsi: pmcraid: Use pci_dev_id() to simplify the code X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5d344c5eb4158808ce82cacf8d5dae8339da84f2;p=linux.git scsi: pmcraid: Use pci_dev_id() to simplify the code PCI core API pci_dev_id() can be used to get the BDF number for a PCI device. We don't need to compose it manually. Use pci_dev_id() to simplify the code a little bit. Signed-off-by: Zheng Zengkai Link: https://lore.kernel.org/r/20230811111310.32364-1-zhengzengkai@huawei.com Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 9415a48194704..50dc30051f221 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c @@ -3584,8 +3584,7 @@ static ssize_t pmcraid_show_adapter_id( struct Scsi_Host *shost = class_to_shost(dev); struct pmcraid_instance *pinstance = (struct pmcraid_instance *)shost->hostdata; - u32 adapter_id = (pinstance->pdev->bus->number << 8) | - pinstance->pdev->devfn; + u32 adapter_id = pci_dev_id(pinstance->pdev); u32 aen_group = pmcraid_event_family.id; return snprintf(buf, PAGE_SIZE,