powerpc/powernv/npu: Use pci_dev_id() helper

Use new helper pci_dev_id() to simplify the code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>

diff --git a/arch/powerpc/platforms/powernv/npu-dma.c b/arch/powerpc/platforms/powernv/npu-dma.c
index dc23d9d2a7d9ae60c9c956dfeadd7e480e243891..495550432f3d62fd50a2aeacdfd902a5f20303b8 100644 (file)
--- a/arch/powerpc/platforms/powernv/npu-dma.c
+++ b/arch/powerpc/platforms/powernv/npu-dma.c
@@ -1213,9 +1213,8 @@ int pnv_npu2_map_lpar_dev(struct pci_dev *gpdev, unsigned int lparid,
         * Currently we only support radix and non-zero LPCR only makes sense
         * for hash tables so skiboot expects the LPCR parameter to be a zero.
         */
-       ret = opal_npu_map_lpar(nphb->opal_id,
-                       PCI_DEVID(gpdev->bus->number, gpdev->devfn), lparid,
-                       0 /* LPCR bits */);
+       ret = opal_npu_map_lpar(nphb->opal_id, pci_dev_id(gpdev), lparid,
+                               0 /* LPCR bits */);
        if (ret) {
                dev_err(&gpdev->dev, "Error %d mapping device to LPAR\n", ret);
                return ret;
@@ -1224,7 +1223,7 @@ int pnv_npu2_map_lpar_dev(struct pci_dev *gpdev, unsigned int lparid,
        dev_dbg(&gpdev->dev, "init context opalid=%llu msr=%lx\n",
                        nphb->opal_id, msr);
        ret = opal_npu_init_context(nphb->opal_id, 0/*__unused*/, msr,
-                       PCI_DEVID(gpdev->bus->number, gpdev->devfn));
+                                   pci_dev_id(gpdev));
        if (ret < 0)
                dev_err(&gpdev->dev, "Failed to init context: %d\n", ret);
        else
@@ -1258,7 +1257,7 @@ int pnv_npu2_unmap_lpar_dev(struct pci_dev *gpdev)
        dev_dbg(&gpdev->dev, "destroy context opalid=%llu\n",
                        nphb->opal_id);
        ret = opal_npu_destroy_context(nphb->opal_id, 0/*__unused*/,
-                       PCI_DEVID(gpdev->bus->number, gpdev->devfn));
+                                      pci_dev_id(gpdev));
        if (ret < 0) {
                dev_err(&gpdev->dev, "Failed to destroy context: %d\n", ret);
                return ret;
@@ -1266,9 +1265,8 @@ int pnv_npu2_unmap_lpar_dev(struct pci_dev *gpdev)
 
        /* Set LPID to 0 anyway, just to be safe */
        dev_dbg(&gpdev->dev, "Map LPAR opalid=%llu lparid=0\n", nphb->opal_id);
-       ret = opal_npu_map_lpar(nphb->opal_id,
-                       PCI_DEVID(gpdev->bus->number, gpdev->devfn), 0 /*LPID*/,
-                       0 /* LPCR bits */);
+       ret = opal_npu_map_lpar(nphb->opal_id, pci_dev_id(gpdev), 0 /*LPID*/,
+                               0 /* LPCR bits */);
        if (ret)
                dev_err(&gpdev->dev, "Error %d mapping device to LPAR\n", ret);