diff --git a/include/linux/pci.h b/include/linux/pci.h
index 5faa831..971d0e9 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1396,16 +1396,32 @@ static inline struct pci_dev *pci_dev_get(struct pci_dev *dev)
 
 /* these helpers provide future and backwards compatibility
  * for accessing popular PCI BAR info */
-#define pci_resource_start(dev, bar)	((dev)->resource[(bar)].start)
-#define pci_resource_end(dev, bar)	((dev)->resource[(bar)].end)
-#define pci_resource_flags(dev, bar)	((dev)->resource[(bar)].flags)
-#define pci_resource_len(dev,bar) \
-	((pci_resource_start((dev), (bar)) == 0 &&	\
-	  pci_resource_end((dev), (bar)) ==		\
-	  pci_resource_start((dev), (bar))) ? 0 :	\
-							\
-	 (pci_resource_end((dev), (bar)) -		\
-	  pci_resource_start((dev), (bar)) + 1))
+static inline resource_size_t
+pci_resource_start(const struct pci_dev *dev, int index)
+{
+	return dev->resource[index].start;
+}
+
+static inline resource_size_t
+pci_resource_end(const struct pci_dev *dev, int index)
+{
+	return dev->resource[index].end;
+}
+
+static inline unsigned long
+pci_resource_flags(const struct pci_dev *dev, int index)
+{
+	return dev->resource[index].flags;
+}
+
+static inline resource_size_t
+pci_resource_len(const struct pci_dev *dev, int index)
+{
+	if (pci_resource_start(dev, index) == 0 &&
+	    pci_resource_end(dev, index) == 0)
+		return 0;
+	return resource_size(&dev->resource[index]);
+}
 
 /* Similar to the helpers above, these manipulate per-pci_dev
  * driver-specific data.  They are really just a wrapper around