Merge tag 'nfs-for-4.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux.git] / drivers / of / irq.c

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 02ad93a304a46dd252331791285234191f41ec05..e1f6f392a4c0dde02904724b7923c6806c95fb06 100644 (file)
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -22,7 +22,6 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_irq.h>
-#include <linux/of_pci.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 
@@ -588,8 +587,8 @@ static u32 __of_msi_map_rid(struct device *dev, struct device_node **np,
         * "msi-map" property.
         */
        for (parent_dev = dev; parent_dev; parent_dev = parent_dev->parent)
-               if (!of_pci_map_rid(parent_dev->of_node, rid_in, "msi-map",
-                                   "msi-map-mask", np, &rid_out))
+               if (!of_map_rid(parent_dev->of_node, rid_in, "msi-map",
+                               "msi-map-mask", np, &rid_out))
                        break;
        return rid_out;
 }