lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cxgb4vf: Check driver parameters in the right place ...

Browse Source 
Check module parameter validity in the module initialization routine instead
of the PCI Device Probe routine.

Signed-off-by: Casey Leedom <leedom@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Casey Leedom
2011-02-14 12:56:22 +00:00
committed by David S. Miller
parent 98200ec28a
commit bb14a1af86
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/cxgb4vf/cxgb4vf_main.c
View File

@@ -2488,17 +2488,6 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
struct port_info *pi; struct port_info *pi;
struct net_device *netdev; struct net_device *netdev;
/*
* Vet our module parameters.
*/
if (msi != MSI_MSIX && msi != MSI_MSI) {
dev_err(&pdev->dev, "bad module parameter msi=%d; must be %d"
" (MSI-X or MSI) or %d (MSI)\n", msi, MSI_MSIX,
MSI_MSI);
err = -EINVAL;
goto err_out;
}
/* /*
* Print our driver banner the first time we're called to initialize a * Print our driver banner the first time we're called to initialize a
* device. * device.
@@ -2802,7 +2791,6 @@ err_release_regions:
err_disable_device: err_disable_device:
pci_disable_device(pdev); pci_disable_device(pdev);
err_out:
return err; return err;
} }
@@ -2915,6 +2903,17 @@ static int __init cxgb4vf_module_init(void)
{ {
int ret; int ret;
/*
* Vet our module parameters.
*/
if (msi != MSI_MSIX && msi != MSI_MSI) {
printk(KERN_WARNING KBUILD_MODNAME
": bad module parameter msi=%d; must be %d"
" (MSI-X or MSI) or %d (MSI)\n",
msi, MSI_MSIX, MSI_MSI);
return -EINVAL;
}
/* Debugfs support is optional, just warn if this fails */ /* Debugfs support is optional, just warn if this fails */
cxgb4vf_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL); cxgb4vf_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);
if (!cxgb4vf_debugfs_root) if (!cxgb4vf_debugfs_root)