]> git.baikalelectronics.ru Git - kernel.git/commitdiff
lib8390: Use netif_msg_init to initialize msg_enable bits
authorArmin Wolf <W_Armin@gmx.de>
Wed, 30 Sep 2020 20:44:56 +0000 (22:44 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Oct 2020 02:08:46 +0000 (19:08 -0700)
Use netif_msg_init() to process param settings
and use only the proper initialized value of
ei_local->msg_level for later processing;

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/8390/lib8390.c

index deba94d2c9094150de39c7b73fa757bc92409a72..e84021282edf30eaee5e8f1ead2ae0bc526193a8 100644 (file)
@@ -113,8 +113,10 @@ static void do_set_multicast_list(struct net_device *dev);
 static void __NS8390_init(struct net_device *dev, int startp);
 
 static unsigned version_printed;
-static u32 msg_enable;
-module_param(msg_enable, uint, 0444);
+static int msg_enable;
+static const int default_msg_level = (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_RX_ERR |
+                                    NETIF_MSG_TX_ERR);
+module_param(msg_enable, int, 0444);
 MODULE_PARM_DESC(msg_enable, "Debug message level (see linux/netdevice.h for bitmap)");
 
 /*
@@ -974,14 +976,14 @@ static void ethdev_setup(struct net_device *dev)
 {
        struct ei_device *ei_local = netdev_priv(dev);
 
-       if ((msg_enable & NETIF_MSG_DRV) && (version_printed++ == 0))
-               pr_info("%s", version);
-
        ether_setup(dev);
 
        spin_lock_init(&ei_local->page_lock);
 
-       ei_local->msg_enable = msg_enable;
+       ei_local->msg_enable = netif_msg_init(msg_enable, default_msg_level);
+
+       if (netif_msg_drv(ei_local) && (version_printed++ == 0))
+               pr_info("%s", version);
 }
 
 /**