PCI/MSI: Make pci_enable_msi/msix() 'nvec' argument type as int
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 <agordeev@redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
parent
8ec5db6b20
commit
52179dc9ed
|
@ -129,7 +129,7 @@ call to succeed.
|
||||||
|
|
||||||
4.2.3 pci_enable_msi_block_auto
|
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
|
This variation on pci_enable_msi() call allows a device driver to request
|
||||||
the maximum possible number of MSIs. The MSI specification only allows
|
the maximum possible number of MSIs. The MSI specification only allows
|
||||||
|
|
|
@ -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
|
* updates the @dev's irq member to the lowest new interrupt number; the
|
||||||
* other interrupt numbers allocated to this device are consecutive.
|
* 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;
|
int status, maxvec;
|
||||||
u16 msgctl;
|
u16 msgctl;
|
||||||
|
@ -886,7 +886,7 @@ int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(pci_enable_msi_block);
|
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;
|
int ret, nvec;
|
||||||
u16 msgctl;
|
u16 msgctl;
|
||||||
|
|
|
@ -1154,13 +1154,13 @@ struct msix_entry {
|
||||||
|
|
||||||
|
|
||||||
#ifndef CONFIG_PCI_MSI
|
#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;
|
return -ENOSYS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int
|
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;
|
return -ENOSYS;
|
||||||
}
|
}
|
||||||
|
@ -1195,8 +1195,8 @@ static inline int pci_msi_enabled(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
int pci_enable_msi_block(struct pci_dev *dev, unsigned int nvec);
|
int pci_enable_msi_block(struct pci_dev *dev, int nvec);
|
||||||
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);
|
||||||
void pci_msi_shutdown(struct pci_dev *dev);
|
void pci_msi_shutdown(struct pci_dev *dev);
|
||||||
void pci_disable_msi(struct pci_dev *dev);
|
void pci_disable_msi(struct pci_dev *dev);
|
||||||
int pci_msix_table_size(struct pci_dev *dev);
|
int pci_msix_table_size(struct pci_dev *dev);
|
||||||
|
|
Loading…
Reference in a new issue