[PATCH 4/7] staging: wilc1000: linux_mon.c: replaces PRINT_ER with netdev_err

[Leo Kim]

This patches replaces PRINT_ER with netdev_err.
Removes unnecessary debug logs as well.

Signed-off-by: Leo Kim <leo....@atmel.com>
---
 drivers/staging/wilc1000/linux_mon.c | 38 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_mon.c 
b/drivers/staging/wilc1000/linux_mon.c
index e550027..99f4ba3b 100644
--- a/drivers/staging/wilc1000/linux_mon.c
+++ b/drivers/staging/wilc1000/linux_mon.c
@@ -169,24 +169,18 @@ static int mon_mgmt_tx(struct net_device *dev, const u8 
*buf, size_t len)
 {
        struct tx_complete_mon_data *mgmt_tx = NULL;
 
-       if (dev == NULL) {
-               PRINT_D(HOSTAPD_DBG, "ERROR: dev == NULL\n");
+       if (!dev)
                return -EFAULT;
-       }
 
        netif_stop_queue(dev);
        mgmt_tx = kmalloc(sizeof(struct tx_complete_mon_data), GFP_ATOMIC);
-       if (mgmt_tx == NULL) {
-               PRINT_ER("Failed to allocate memory for mgmt_tx structure\n");
+       if (!mgmt_tx)
                return -EFAULT;
-       }
 
        mgmt_tx->buff = kmalloc(len, GFP_ATOMIC);
-       if (mgmt_tx->buff == NULL) {
-               PRINT_ER("Failed to allocate memory for mgmt_tx buff\n");
+       if (!mgmt_tx->buff) {
                kfree(mgmt_tx);
                return -EFAULT;
-
        }
 
        mgmt_tx->size = len;
@@ -221,18 +215,13 @@ static netdev_tx_t WILC_WFI_mon_xmit(struct sk_buff *skb,
                return -EFAULT;
 
        mon_priv = netdev_priv(wilc_wfi_mon);
-
-       if (mon_priv == NULL) {
-               PRINT_ER("Monitor interface private structure is NULL\n");
+       if (!mon_priv)
                return -EFAULT;
-       }
-
 
        rtap_len = ieee80211_get_radiotap_len(skb->data);
-       if (skb->len < rtap_len) {
-               PRINT_ER("Error in radiotap header\n");
+       if (skb->len < rtap_len)
                return -1;
-       }
+
        /* skip the radiotap header */
        PRINT_INFO(HOSTAPD_DBG, "Radiotap len: %d\n", rtap_len);
 
@@ -292,7 +281,9 @@ static netdev_tx_t WILC_WFI_mon_xmit(struct sk_buff *skb,
        /* if source address and bssid fields are equal>>Mac header */
        /*send it to mgmt frames handler */
        if (!(memcmp(srcAdd, bssid, 6))) {
-               mon_mgmt_tx(mon_priv->real_ndev, skb->data, skb->len);
+               ret = mon_mgmt_tx(mon_priv->real_ndev, skb->data, skb->len);
+               if (ret)
+                       netdev_err(dev, "fail to mgmt tx\n");
                dev_kfree_skb(skb);
        } else
                ret = wilc_mac_xmit(skb, mon_priv->real_ndev);
@@ -327,12 +318,9 @@ struct net_device *WILC_WFI_init_mon_interface(const char 
*name, struct net_devi
        }
 
        wilc_wfi_mon = alloc_etherdev(sizeof(struct WILC_WFI_mon_priv));
-       if (!wilc_wfi_mon) {
-               PRINT_ER("failed to allocate memory\n");
+       if (!wilc_wfi_mon)
                return NULL;
 
-       }
-
        wilc_wfi_mon->type = ARPHRD_IEEE80211_RADIOTAP;
        strncpy(wilc_wfi_mon->name, name, IFNAMSIZ);
        wilc_wfi_mon->name[IFNAMSIZ - 1] = 0;
@@ -340,14 +328,12 @@ struct net_device *WILC_WFI_init_mon_interface(const char 
*name, struct net_devi
 
        ret = register_netdevice(wilc_wfi_mon);
        if (ret) {
-               PRINT_ER(" register_netdevice failed (%d)\n", ret);
+               netdev_err(real_dev, "register_netdevice failed\n");
                return NULL;
        }
        priv = netdev_priv(wilc_wfi_mon);
-       if (priv == NULL) {
-               PRINT_ER("private structure is NULL\n");
+       if (!priv)
                return NULL;
-       }
 
        priv->real_ndev = real_dev;
 
-- 
1.9.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel