Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb14a1af authored by Casey Leedom's avatar Casey Leedom Committed by David S. Miller
Browse files

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



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

Signed-off-by: default avatarCasey Leedom <leedom@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 98200ec2

drivers/net/cxgb4vf/cxgb4vf_main.c

+11 −12
Original line number Diff line number Diff line
@@ -2488,17 +2488,6 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev, 
	struct port_info *pi;

	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

	 * device.
@@ -2802,7 +2791,6 @@ err_release_regions: 
err_disable_device:

	pci_disable_device(pdev);



err_out:

	return err;

}
@@ -2915,6 +2903,17 @@ static int __init cxgb4vf_module_init(void) 
{

	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 */

	cxgb4vf_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);

	if (!cxgb4vf_debugfs_root)