PCI: fix pci_resource_alignment prototype

camm-xx · jbarnes993 · commit 0e52247a2ed1 · 2010-09-09T13:41:25.000-07:00
This fixes the prototype for both pci_resource_alignment() and
pci_sriov_resource_alignment().

Patch started as debugging effort from Cam Macdonell.

Cc: Cam Macdonell &lt;cam@cs.ualberta.ca&gt;
Cc: Avi Kivity &lt;avi@redhat.com&gt;
[chrisw: add iov bits]
Signed-off-by: Chris Wright &lt;chrisw@sous-sol.org&gt;
Signed-off-by: Jesse Barnes &lt;jbarnes@virtuousgeek.org&gt;
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
@@ -608,7 +608,7 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno,
  * the VF BAR size multiplied by the number of VFs.  The alignment
  * is just the VF BAR size.
  */
-int pci_sriov_resource_alignment(struct pci_dev *dev, int resno)
+resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno)
 {
 	struct resource tmp;
 	enum pci_bar_type type;
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
@@ -264,7 +264,8 @@ extern int pci_iov_init(struct pci_dev *dev);
 extern void pci_iov_release(struct pci_dev *dev);
 extern int pci_iov_resource_bar(struct pci_dev *dev, int resno,
 				enum pci_bar_type *type);
-extern int pci_sriov_resource_alignment(struct pci_dev *dev, int resno);
+extern resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev,
+						    int resno);
 extern void pci_restore_iov_state(struct pci_dev *dev);
 extern int pci_iov_bus_range(struct pci_bus *bus);
 
@@ -320,7 +321,7 @@ static inline int pci_ats_enabled(struct pci_dev *dev)
 }
 #endif /* CONFIG_PCI_IOV */
 
-static inline int pci_resource_alignment(struct pci_dev *dev,
+static inline resource_size_t pci_resource_alignment(struct pci_dev *dev,
 					 struct resource *res)
 {
 #ifdef CONFIG_PCI_IOV

Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,7 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno,`
`608`	`608`	`* the VF BAR size multiplied by the number of VFs. The alignment`
`609`	`609`	`* is just the VF BAR size.`
`610`	`610`	`*/`
`611`		`-int pci_sriov_resource_alignment(struct pci_dev *dev, int resno)`
	`611`	`+resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno)`
`612`	`612`	`{`
`613`	`613`	`struct resource tmp;`
`614`	`614`	`enum pci_bar_type type;`