[PATCH] x86/PCI: Use pci_dev_id() to simplify the code

[PATCH] x86/PCI: Use pci_dev_id() to simplify the code

[Jialin Zhang]

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 mannually. Use pci_dev_id() to
simplify the code a little bit.

Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>
---
 arch/x86/pci/pcbios.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
index 4f15280732ed..fc05ec31cabf 100644
--- a/arch/x86/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
@@ -412,7 +412,7 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
 		"1:"
 		: "=a" (ret)
 		: "0" (PCIBIOS_SET_PCI_HW_INT),
-		  "b" ((dev->bus->number << 8) | dev->devfn),
+		  "b" (pci_dev_id(dev)),
 		  "c" ((irq << 8) | (pin + 10)),
 		  "S" (&pci_indirect));
 	return !(ret & 0xff00);
-- 
2.25.1

Re: [PATCH] x86/PCI: Use pci_dev_id() to simplify the code

[Bjorn Helgaas]

On Tue, Aug 15, 2023 at 10:24:40AM +0800, Jialin Zhang wrote:
> 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 mannually. Use pci_dev_id() to
> simplify the code a little bit.

s/for a pci/for a PCI/
s/mannually/manually/

Or you could use the commit log I tweaked for the similar drivers/pci
patches:

  When we have a struct pci_dev *, use pci_dev_id() instead of manually
  composing the ID from dev->bus->number and dev->devfn.

If you fix the typos or update the commit log:

  Acked-by: Bjorn Helgaas <bhelgaas@google.com>

> Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>
> ---
>  arch/x86/pci/pcbios.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
> index 4f15280732ed..fc05ec31cabf 100644
> --- a/arch/x86/pci/pcbios.c
> +++ b/arch/x86/pci/pcbios.c
> @@ -412,7 +412,7 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
>  		"1:"
>  		: "=a" (ret)
>  		: "0" (PCIBIOS_SET_PCI_HW_INT),
> -		  "b" ((dev->bus->number << 8) | dev->devfn),
> +		  "b" (pci_dev_id(dev)),
>  		  "c" ((irq << 8) | (pin + 10)),
>  		  "S" (&pci_indirect));
>  	return !(ret & 0xff00);
> -- 
> 2.25.1
>