]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: ks7010: ks_wlan_net: Use netdev_ instead of printk
authorGeorgiana Rodica Chelu <georgiana.chelu93@gmail.com>
Mon, 26 Sep 2016 08:15:56 +0000 (11:15 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Sep 2016 11:03:57 +0000 (13:03 +0200)
The checkpatch.pl script found the following warning:

WARNING: printk() should include KERN_ facility level

After adding the KERN_ facility level to printk(), the script showed
another warning:

WARNING: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then
dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...

The warning is similar for KERN_ERR and KERN_DEBUG. In conclusion,
use netdev_info(), netdev_err() or netdev_dbg() when there is
a netdev device.

Signed-off-by: Georgiana Rodica Chelu <georgiana.chelu93@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ks7010/ks_wlan_net.c

index 9e2bdd6f1ded75b388d3c19a499d1477494ac40d..4a14327cc20d3635b51f2af792f3d1a9c569f112 100644 (file)
@@ -233,9 +233,9 @@ static int ks_wlan_set_freq(struct net_device *dev,
                /* We should do a better check than that,
                 * based on the card capability !!! */
                if ((channel < 1) || (channel > 14)) {
-                       printk(KERN_DEBUG
-                              "%s: New channel value of %d is invalid!\n",
-                              dev->name, fwrq->m);
+                       netdev_dbg(dev,
+                                  "%s: New channel value of %d is invalid!\n",
+                                  dev->name, fwrq->m);
                        rc = -EINVAL;
                } else {
                        /* Yes ! We can set it !!! */
@@ -2671,17 +2671,17 @@ static int ks_wlan_set_sleep_mode(struct net_device *dev,
 
        if (*uwrq == SLP_SLEEP) {
                priv->sleep_mode = *uwrq;
-               printk("SET_SLEEP_MODE %d\n", priv->sleep_mode);
+               netdev_info(dev, "SET_SLEEP_MODE %d\n", priv->sleep_mode);
 
                hostif_sme_enqueue(priv, SME_STOP_REQUEST);
                hostif_sme_enqueue(priv, SME_SLEEP_REQUEST);
 
        } else if (*uwrq == SLP_ACTIVE) {
                priv->sleep_mode = *uwrq;
-               printk("SET_SLEEP_MODE %d\n", priv->sleep_mode);
+               netdev_info(dev, "SET_SLEEP_MODE %d\n", priv->sleep_mode);
                hostif_sme_enqueue(priv, SME_SLEEP_REQUEST);
        } else {
-               printk("SET_SLEEP_MODE %d errror\n", *uwrq);
+               netdev_err(dev, "SET_SLEEP_MODE %d errror\n", *uwrq);
                return -EINVAL;
        }
 
@@ -2783,7 +2783,7 @@ static int ks_wlan_get_wps_enable(struct net_device *dev,
        }
        /* for SLEEP MODE */
        *uwrq = priv->wps.wps_enabled;
-       printk("return=%d\n", *uwrq);
+       netdev_info(dev, "return=%d\n", *uwrq);
 
        return 0;
 }
@@ -3330,7 +3330,7 @@ int ks_wlan_set_mac_address(struct net_device *dev, void *addr)
 
        priv->mac_address_valid = 0;
        hostif_sme_enqueue(priv, SME_MACADDRESS_SET_REQUEST);
-       printk(KERN_INFO
+       netdev_info(dev,
               "ks_wlan: MAC ADDRESS = %02x:%02x:%02x:%02x:%02x:%02x\n",
               priv->eth_addr[0], priv->eth_addr[1], priv->eth_addr[2],
               priv->eth_addr[3], priv->eth_addr[4], priv->eth_addr[5]);
@@ -3360,7 +3360,7 @@ int ks_wlan_start_xmit(struct sk_buff *skb, struct net_device *dev)
        DPRINTK(3, "in_interrupt()=%ld\n", in_interrupt());
 
        if (!skb) {
-               printk(KERN_ERR "ks_wlan:  skb == NULL!!!\n");
+               netdev_err(dev, "ks_wlan:  skb == NULL!!!\n");
                return 0;
        }
        if (priv->dev_state < DEVICE_STATE_READY) {
@@ -3424,7 +3424,7 @@ int ks_wlan_open(struct net_device *dev)
        priv->cur_rx = 0;
 
        if (!priv->mac_address_valid) {
-               printk(KERN_ERR "ks_wlan : %s Not READY !!\n", dev->name);
+               netdev_err(dev, "ks_wlan : %s Not READY !!\n", dev->name);
                return -EBUSY;
        } else
                netif_start_queue(dev);