PCI/MSI: Make pci_enable_msi/msix() 'nvec' argument type as int

Alexander Gordeev · bjorn-helgaas · commit 52179dc9edc3 · 2013-12-20T09:45:05.000-07:00
Make pci_enable_msi_block(), pci_enable_msi_block_auto() and
pci_enable_msix() consistent with regard to the type of 'nvec' argument.

Signed-off-by: Alexander Gordeev &lt;agordeev@redhat.com&gt;
Signed-off-by: Bjorn Helgaas &lt;bhelgaas@google.com&gt;
Reviewed-by: Tejun Heo &lt;tj@kernel.org&gt;
diff --git a/Documentation/PCI/MSI-HOWTO.txt b/Documentation/PCI/MSI-HOWTO.txt
@@ -129,7 +129,7 @@ call to succeed.
 
 4.2.3 pci_enable_msi_block_auto
 
-int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *count)
+int pci_enable_msi_block_auto(struct pci_dev *dev, int *count)
 
 This variation on pci_enable_msi() call allows a device driver to request
 the maximum possible number of MSIs.  The MSI specification only allows
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
@@ -855,7 +855,7 @@ static int pci_msi_check_device(struct pci_dev *dev, int nvec, int type)
  * updates the @dev's irq member to the lowest new interrupt number; the
  * other interrupt numbers allocated to this device are consecutive.
  */
-int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)
+int pci_enable_msi_block(struct pci_dev *dev, int nvec)
 {
 	int status, maxvec;
 	u16 msgctl;
@@ -886,7 +886,7 @@ int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)
 }
 EXPORT_SYMBOL(pci_enable_msi_block);
 
-int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec)
+int pci_enable_msi_block_auto(struct pci_dev *dev, int *maxvec)
 {
 	int ret, nvec;
 	u16 msgctl;
diff --git a/include/linux/pci.h b/include/linux/pci.h
@@ -1154,13 +1154,13 @@ struct msix_entry {
 
 
 #ifndef CONFIG_PCI_MSI
-static inline int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)
+static inline int pci_enable_msi_block(struct pci_dev *dev, int nvec)
 {
 	return -ENOSYS;
 }
 
 static inline int
-pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec)
+pci_enable_msi_block_auto(struct pci_dev *dev, int *maxvec)
 {
 	return -ENOSYS;
 }
@@ -1195,8 +1195,8 @@ static inline int pci_msi_enabled(void)
 	return 0;
 }
 #else
-int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec);
-int pci_enable_msi_block_auto(struct pci_dev *dev, unsigned int *maxvec);
+int pci_enable_msi_block(struct pci_dev *dev, int nvec);
+int pci_enable_msi_block_auto(struct pci_dev *dev, int *maxvec);
 void pci_msi_shutdown(struct pci_dev *dev);
 void pci_disable_msi(struct pci_dev *dev);
 int pci_msix_table_size(struct pci_dev *dev);

Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ static int pci_msi_check_device(struct pci_dev *dev, int nvec, int type)`
`855`	`855`	`* updates the @dev's irq member to the lowest new interrupt number; the`
`856`	`856`	`* other interrupt numbers allocated to this device are consecutive.`
`857`	`857`	`*/`
`858`		`-int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)`
	`858`	`+int pci_enable_msi_block(struct pci_dev *dev, int nvec)`
`859`	`859`	`{`
`860`	`860`	`int status, maxvec;`
`861`	`861`	`u16 msgctl;`
`@@ -886,7 +886,7 @@ int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)`
`886`	`886`	`}`
`887`	`887`	`EXPORT_SYMBOL(pci_enable_msi_block);`
`888`	`888`
`889`		`-int pci_enable_msi_block_auto(struct pci_dev dev, unsigned int maxvec)`
	`889`	`+int pci_enable_msi_block_auto(struct pci_dev dev, int maxvec)`
`890`	`890`	`{`
`891`	`891`	`int ret, nvec;`
`892`	`892`	`u16 msgctl;`
Original file line number	Diff line number	Diff line change
`@@ -1154,13 +1154,13 @@ struct msix_entry {`
`1154`	`1154`
`1155`	`1155`
`1156`	`1156`	`#ifndef CONFIG_PCI_MSI`
`1157`		`-static inline int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)`
	`1157`	`+static inline int pci_enable_msi_block(struct pci_dev *dev, int nvec)`
`1158`	`1158`	`{`
`1159`	`1159`	`return -ENOSYS;`
`1160`	`1160`	`}`
`1161`	`1161`
`1162`	`1162`	`static inline int`
`1163`		`-pci_enable_msi_block_auto(struct pci_dev dev, unsigned int maxvec)`
	`1163`	`+pci_enable_msi_block_auto(struct pci_dev dev, int maxvec)`
`1164`	`1164`	`{`
`1165`	`1165`	`return -ENOSYS;`
`1166`	`1166`	`}`
`@@ -1195,8 +1195,8 @@ static inline int pci_msi_enabled(void)`
`1195`	`1195`	`return 0;`
`1196`	`1196`	`}`
`1197`	`1197`	`#else`
`1198`		`-int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec);`
`1199`		`-int pci_enable_msi_block_auto(struct pci_dev dev, unsigned int maxvec);`
	`1198`	`+int pci_enable_msi_block(struct pci_dev *dev, int nvec);`
	`1199`	`+int pci_enable_msi_block_auto(struct pci_dev dev, int maxvec);`
`1200`	`1200`	`void pci_msi_shutdown(struct pci_dev *dev);`
`1201`	`1201`	`void pci_disable_msi(struct pci_dev *dev);`
`1202`	`1202`	`int pci_msix_table_size(struct pci_dev *dev);`