[PATCH 36/38] staging: wilc1000: rename s32Error of mac_ioctl function
Glen Lee
glen.lee at atmel.com
Mon Nov 2 08:51:19 UTC 2015
From: Leo Kim <leo.kim at atmel.com>
This patch rename s32Error variable of mac_ioctl function to ret
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim <leo.kim at atmel.com>
Signed-off-by: Glen Lee <glen.lee at atmel.com>
---
drivers/staging/wilc1000/linux_wlan.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 8370a90..0eba943 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1349,7 +1349,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);
@@ -1373,8 +1373,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);
@@ -1384,7 +1385,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;
}
}
@@ -1395,7 +1396,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;
}
}
@@ -1404,7 +1405,7 @@ done:
kfree(buff);
- return s32Error;
+ return ret;
}
void frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset)
--
1.9.1
More information about the devel
mailing list