Commit d332642a authored by Xiongfeng Wang's avatar Xiongfeng Wang Committed by Bjorn Helgaas
Browse files

PCI: apple: Use pci_dev_id() to simplify the code 

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

[bhelgaas: commit log]
Link: https://lore.kernel.org/r/20230807134858.116051-2-wangxiongfeng2@huawei.com


Signed-off-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent e3a3a097

drivers/pci/controller/pcie-apple.c

+2 −2
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ static struct apple_pcie_port *apple_pcie_get_port(struct pci_dev *pdev) 
static int apple_pcie_add_device(struct apple_pcie_port *port,

				 struct pci_dev *pdev)

{

	u32 sid, rid = PCI_DEVID(pdev->bus->number, pdev->devfn);

	u32 sid, rid = pci_dev_id(pdev);

	int idx, err;



	dev_dbg(&pdev->dev, "added to bus %s, index %d\n",
@@ -701,7 +701,7 @@ static int apple_pcie_add_device(struct apple_pcie_port *port, 
static void apple_pcie_release_device(struct apple_pcie_port *port,

				      struct pci_dev *pdev)

{

	u32 rid = PCI_DEVID(pdev->bus->number, pdev->devfn);

	u32 rid = pci_dev_id(pdev);

	int idx;



	mutex_lock(&port->pcie->lock);