فهرست منبع

bnx2x: Move printing of version from probe to the init

Move printing of version from probe to the init function
Rather then checking if this is the first module probe call to print
the version of the driver only once, the statement is moved to the init
function of the module where init is only called once

Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Eilon Greenstein 16 سال پیش
والد
کامیت
938cf5416d
1فایلهای تغییر یافته به همراه2 افزوده شده و 4 حذف شده
  1. 2 4
      drivers/net/bnx2x_main.c

+ 2 - 4
drivers/net/bnx2x_main.c

@@ -11872,15 +11872,11 @@ request_firmware_exit:
 static int __devinit bnx2x_init_one(struct pci_dev *pdev,
 static int __devinit bnx2x_init_one(struct pci_dev *pdev,
 				    const struct pci_device_id *ent)
 				    const struct pci_device_id *ent)
 {
 {
-	static int version_printed;
 	struct net_device *dev = NULL;
 	struct net_device *dev = NULL;
 	struct bnx2x *bp;
 	struct bnx2x *bp;
 	int pcie_width, pcie_speed;
 	int pcie_width, pcie_speed;
 	int rc;
 	int rc;
 
 
-	if (version_printed++ == 0)
-		printk(KERN_INFO "%s", version);
-
 	/* dev zeroed in init_etherdev */
 	/* dev zeroed in init_etherdev */
 	dev = alloc_etherdev_mq(sizeof(*bp), MAX_CONTEXT);
 	dev = alloc_etherdev_mq(sizeof(*bp), MAX_CONTEXT);
 	if (!dev) {
 	if (!dev) {
@@ -12218,6 +12214,8 @@ static int __init bnx2x_init(void)
 {
 {
 	int ret;
 	int ret;
 
 
+	printk(KERN_INFO "%s", version);
+
 	bnx2x_wq = create_singlethread_workqueue("bnx2x");
 	bnx2x_wq = create_singlethread_workqueue("bnx2x");
 	if (bnx2x_wq == NULL) {
 	if (bnx2x_wq == NULL) {
 		printk(KERN_ERR PFX "Cannot create workqueue\n");
 		printk(KERN_ERR PFX "Cannot create workqueue\n");