]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: wilc1000: rename s32Error of mac_ioctl function
authorLeo Kim <leo.kim@atmel.com>
Thu, 5 Nov 2015 05:36:37 +0000 (14:36 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Nov 2015 04:02:47 +0000 (20:02 -0800)
This patch rename s32Error variable of mac_ioctl function to ret
to avoid CamelCase naming convention.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/linux_wlan.c

index f2de20ba2a2996260e0bc0fe9420cf0e320e8e7b..f1dcdfbe6d666dcb5d984f3a4003be5e1b59adfc 100644 (file)
@@ -1344,7 +1344,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
        u32 size = 0, length = 0;
        perInterface_wlan_t *nic;
        struct wilc_priv *priv;
-       s32 s32Error = 0;
+       s32 ret = 0;
        struct wilc *wilc;
 
        nic = netdev_priv(ndev);
@@ -1368,8 +1368,9 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
 
                        if (strncasecmp(buff, "RSSI", length) == 0) {
                                priv = wiphy_priv(nic->wilc_netdev->ieee80211_ptr->wiphy);
-                               s32Error = host_int_get_rssi(priv->hWILCWFIDrv, &(rssi));
-                               if (s32Error)
+                               ret = host_int_get_rssi(priv->hWILCWFIDrv,
+                                                       &rssi);
+                               if (ret)
                                        PRINT_ER("Failed to send get rssi param's message queue ");
                                PRINT_INFO(GENERIC_DBG, "RSSI :%d\n", rssi);
 
@@ -1379,7 +1380,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
 
                                if (copy_to_user(wrq->u.data.pointer, buff, size)) {
                                        PRINT_ER("%s: failed to copy data to user buffer\n", __func__);
-                                       s32Error = -EFAULT;
+                                       ret = -EFAULT;
                                        goto done;
                                }
                        }
@@ -1390,7 +1391,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
        default:
        {
                PRINT_INFO(GENERIC_DBG, "Command - %d - has been received\n", cmd);
-               s32Error = -EOPNOTSUPP;
+               ret = -EOPNOTSUPP;
                goto done;
        }
        }
@@ -1399,7 +1400,7 @@ done:
 
        kfree(buff);
 
-       return s32Error;
+       return ret;
 }
 
 void frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset)