@@ -7054,13 +7054,10 @@ static struct pci_driver e1000_driver =
**/
static int __init e1000_init_module(void)
{
- int ret;
pr_info("Intel(R) PRO/1000 Network Driver - %s\n",
e1000e_driver_version);
pr_info("Copyright(c) 1999 - 2013 Intel Corporation.\n");
- ret = pci_register_driver(&e1000_driver);
-
- return ret;
+ return pci_register_driver(&e1000_driver);
}
module_init(e1000_init_module);
@@ -680,7 +680,6 @@ struct net_device *igb_get_hw_dev(struct
**/
static int __init igb_init_module(void)
{
- int ret;
pr_info("%s - version %s\n",
igb_driver_string, igb_driver_version);
@@ -689,8 +688,7 @@ static int __init igb_init_module(void)
#ifdef CONFIG_IGB_DCA
dca_register_notify(&dca_notifier);
#endif
- ret = pci_register_driver(&igb_driver);
- return ret;
+ return pci_register_driver(&igb_driver);
}
module_init(igb_init_module);
@@ -2891,13 +2891,10 @@ static struct pci_driver igbvf_driver =
**/
static int __init igbvf_init_module(void)
{
- int ret;
pr_info("%s - version %s\n", igbvf_driver_string, igbvf_driver_version);
pr_info("%s\n", igbvf_copyright);
- ret = pci_register_driver(&igbvf_driver);
-
- return ret;
+ return pci_register_driver(&igbvf_driver);
}
module_init(igbvf_init_module);
@@ -3614,14 +3614,12 @@ static struct pci_driver ixgbevf_driver
**/
static int __init ixgbevf_init_module(void)
{
- int ret;
pr_info("%s - version %s\n", ixgbevf_driver_string,
ixgbevf_driver_version);
pr_info("%s\n", ixgbevf_copyright);
- ret = pci_register_driver(&ixgbevf_driver);
- return ret;
+ return pci_register_driver(&ixgbevf_driver);
}
module_init(ixgbevf_init_module);
Remove unnecessary assignment, just return result of pci_register_driver Glad to see that Intel does lots of code reuse :-) Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- drivers/net/ethernet/intel/e1000e/netdev.c | 5 +---- drivers/net/ethernet/intel/igb/igb_main.c | 4 +--- drivers/net/ethernet/intel/igbvf/netdev.c | 5 +---- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 4 +--- 4 files changed, 4 insertions(+), 14 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html