FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-10 03:20:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: wilc1000: remove unnecessary use of parentheses

Browse Source 
Fix "Unnecessary parentheses around" issue found by checkpatch.pl
script.Remove the unnecessary parentheses to follow linux coding style.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh 2018-01-22 15:52:14 +05:30 committed by Greg Kroah-Hartman
parent f93a2b8b16
commit 7bf0242a75
8 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/wilc1000/coreconfigurator.c
View File

@ -201,7 +201,7 @@ static inline u16 get_cap_info(u8 *data)
st = get_sub_type(data); st = get_sub_type(data);
if ((st == BEACON) || (st == PROBE_RSP)) if (st == BEACON || st == PROBE_RSP)
index += TIME_STAMP_LEN + BEACON_INTERVAL_LEN; index += TIME_STAMP_LEN + BEACON_INTERVAL_LEN;
cap_info = data[index]; cap_info = data[index];

34
drivers/staging/wilc1000/host_interface.c
View File

@ -394,7 +394,7 @@ static void handle_set_operation_mode(struct wilc_vif *vif,
ret = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, ret = wilc_send_config_pkt(vif, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if ((hif_op_mode->mode) == IDLE_MODE) if (hif_op_mode->mode == IDLE_MODE)
complete(&hif_driver_comp); complete(&hif_driver_comp);
if (ret) if (ret)
@ -760,8 +760,8 @@ static s32 handle_scan(struct wilc_vif *vif, struct scan_attr *scan_info)
hif_drv->usr_scan_req.scan_result = scan_info->result; hif_drv->usr_scan_req.scan_result = scan_info->result;
hif_drv->usr_scan_req.arg = scan_info->arg; hif_drv->usr_scan_req.arg = scan_info->arg;
if ((hif_drv->hif_state >= HOST_IF_SCANNING) && if (hif_drv->hif_state >= HOST_IF_SCANNING &&
(hif_drv->hif_state < HOST_IF_CONNECTED)) { hif_drv->hif_state < HOST_IF_CONNECTED) {
netdev_err(vif->ndev, "Already scan\n"); netdev_err(vif->ndev, "Already scan\n");
result = -EBUSY; result = -EBUSY;
goto ERRORHANDLER; goto ERRORHANDLER;
@ -1025,7 +1025,7 @@ static s32 Handle_Connect(struct wilc_vif *vif,
pu8CurrByte += MAX_SSID_LEN; pu8CurrByte += MAX_SSID_LEN;
*(pu8CurrByte++) = INFRASTRUCTURE; *(pu8CurrByte++) = INFRASTRUCTURE;
if ((pstrHostIFconnectAttr->ch >= 1) && (pstrHostIFconnectAttr->ch <= 14)) { if (pstrHostIFconnectAttr->ch >= 1 && pstrHostIFconnectAttr->ch <= 14) {
*(pu8CurrByte++) = pstrHostIFconnectAttr->ch; *(pu8CurrByte++) = pstrHostIFconnectAttr->ch;
} else { } else {
netdev_err(vif->ndev, "Channel out of range\n"); netdev_err(vif->ndev, "Channel out of range\n");
@ -1258,8 +1258,8 @@ static s32 Handle_RcvdNtwrkInfo(struct wilc_vif *vif,
if (hif_drv->usr_scan_req.scan_result) { if (hif_drv->usr_scan_req.scan_result) {
wilc_parse_network_info(pstrRcvdNetworkInfo->buffer, &pstrNetworkInfo); wilc_parse_network_info(pstrRcvdNetworkInfo->buffer, &pstrNetworkInfo);
if ((!pstrNetworkInfo) || if (!pstrNetworkInfo ||
(!hif_drv->usr_scan_req.scan_result)) { !hif_drv->usr_scan_req.scan_result) {
netdev_err(vif->ndev, "driver is null\n"); netdev_err(vif->ndev, "driver is null\n");
result = -EINVAL; result = -EINVAL;
goto done; goto done;
@ -1340,8 +1340,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
return -ENODEV; return -ENODEV;
} }
if ((hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) || if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP ||
(hif_drv->hif_state == HOST_IF_CONNECTED) || hif_drv->hif_state == HOST_IF_CONNECTED ||
hif_drv->usr_scan_req.scan_result) { hif_drv->usr_scan_req.scan_result) {
if (!pstrRcvdGnrlAsyncInfo->buffer || if (!pstrRcvdGnrlAsyncInfo->buffer ||
!hif_drv->usr_conn_req.conn_result) { !hif_drv->usr_conn_req.conn_result) {
@ -1400,8 +1400,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
} }
} }
if ((u8MacStatus == MAC_CONNECTED) && if (u8MacStatus == MAC_CONNECTED &&
(strConnectInfo.status != SUCCESSFUL_STATUSCODE)) { strConnectInfo.status != SUCCESSFUL_STATUSCODE) {
netdev_err(vif->ndev, "Received MAC status is MAC_CONNECTED while the received status code in Asoc Resp is not SUCCESSFUL_STATUSCODE\n"); netdev_err(vif->ndev, "Received MAC status is MAC_CONNECTED while the received status code in Asoc Resp is not SUCCESSFUL_STATUSCODE\n");
eth_zero_addr(wilc_connected_ssid); eth_zero_addr(wilc_connected_ssid);
} else if (u8MacStatus == MAC_DISCONNECTED) { } else if (u8MacStatus == MAC_DISCONNECTED) {
@ -1412,8 +1412,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
if (hif_drv->usr_conn_req.bssid) { if (hif_drv->usr_conn_req.bssid) {
memcpy(strConnectInfo.bssid, hif_drv->usr_conn_req.bssid, 6); memcpy(strConnectInfo.bssid, hif_drv->usr_conn_req.bssid, 6);
if ((u8MacStatus == MAC_CONNECTED) && if (u8MacStatus == MAC_CONNECTED &&
(strConnectInfo.status == SUCCESSFUL_STATUSCODE)) { strConnectInfo.status == SUCCESSFUL_STATUSCODE) {
memcpy(hif_drv->assoc_bssid, memcpy(hif_drv->assoc_bssid,
hif_drv->usr_conn_req.bssid, ETH_ALEN); hif_drv->usr_conn_req.bssid, ETH_ALEN);
} }
@ -1434,8 +1434,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
NULL, NULL,
hif_drv->usr_conn_req.arg); hif_drv->usr_conn_req.arg);
if ((u8MacStatus == MAC_CONNECTED) && if (u8MacStatus == MAC_CONNECTED &&
(strConnectInfo.status == SUCCESSFUL_STATUSCODE)) { strConnectInfo.status == SUCCESSFUL_STATUSCODE) {
wilc_set_power_mgmt(vif, 0, 0); wilc_set_power_mgmt(vif, 0, 0);
hif_drv->hif_state = HOST_IF_CONNECTED; hif_drv->hif_state = HOST_IF_CONNECTED;
@ -1864,8 +1864,8 @@ void wilc_resolve_disconnect_aberration(struct wilc_vif *vif)
{ {
if (!vif->hif_drv) if (!vif->hif_drv)
return; return;
if ((vif->hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) || if (vif->hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP ||
(vif->hif_drv->hif_state == HOST_IF_CONNECTING)) vif->hif_drv->hif_state == HOST_IF_CONNECTING)
wilc_disconnect(vif, 1); wilc_disconnect(vif, 1);
} }
@ -2414,7 +2414,7 @@ static void Handle_SetMulticastFilter(struct wilc_vif *vif,
wid.id = (u16)WID_SETUP_MULTICAST_FILTER; wid.id = (u16)WID_SETUP_MULTICAST_FILTER;
wid.type = WID_BIN; wid.type = WID_BIN;
wid.size = sizeof(struct set_multicast) + ((strHostIfSetMulti->cnt) * ETH_ALEN); wid.size = sizeof(struct set_multicast) + (strHostIfSetMulti->cnt * ETH_ALEN);
wid.val = kmalloc(wid.size, GFP_KERNEL); wid.val = kmalloc(wid.size, GFP_KERNEL);
if (!wid.val) if (!wid.val)
goto ERRORHANDLER; goto ERRORHANDLER;

8
drivers/staging/wilc1000/linux_wlan.c
View File

@ -911,13 +911,13 @@ static void wilc_set_multicast_list(struct net_device *dev)
if (dev->flags & IFF_PROMISC) if (dev->flags & IFF_PROMISC)
return; return;
if ((dev->flags & IFF_ALLMULTI) || if (dev->flags & IFF_ALLMULTI ||
(dev->mc.count) > WILC_MULTICAST_TABLE_SIZE) { dev->mc.count > WILC_MULTICAST_TABLE_SIZE) {
wilc_setup_multicast_filter(vif, false, 0); wilc_setup_multicast_filter(vif, false, 0);
return; return;
} }
if ((dev->mc.count) == 0) { if (dev->mc.count == 0) {
wilc_setup_multicast_filter(vif, true, 0); wilc_setup_multicast_filter(vif, true, 0);
return; return;
} }
@ -1030,7 +1030,7 @@ static int wilc_mac_close(struct net_device *ndev)
if (!hif_drv) if (!hif_drv)
return 0; return 0;
if ((wl->open_ifcs) > 0) if (wl->open_ifcs > 0)
wl->open_ifcs--; wl->open_ifcs--;
else else
return 0; return 0;

4
drivers/staging/wilc1000/wilc_sdio.c
View File

@ -375,7 +375,7 @@ static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data)
data = cpu_to_le32(data); data = cpu_to_le32(data);
if ((addr >= 0xf0) && (addr <= 0xff)) { if (addr >= 0xf0 && addr <= 0xff) {
struct sdio_cmd52 cmd; struct sdio_cmd52 cmd;
cmd.read_write = 1; cmd.read_write = 1;
@ -515,7 +515,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data)
struct sdio_func *func = dev_to_sdio_func(wilc->dev); struct sdio_func *func = dev_to_sdio_func(wilc->dev);
int ret; int ret;
if ((addr >= 0xf0) && (addr <= 0xff)) { if (addr >= 0xf0 && addr <= 0xff) {
struct sdio_cmd52 cmd; struct sdio_cmd52 cmd;
cmd.read_write = 0; cmd.read_write = 0;

20
drivers/staging/wilc1000/wilc_spi.c
View File

@ -390,11 +390,11 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
#define NUM_DATA_BYTES (4) #define NUM_DATA_BYTES (4)
#define NUM_CRC_BYTES (2) #define NUM_CRC_BYTES (2)
#define NUM_DUMMY_BYTES (3) #define NUM_DUMMY_BYTES (3)
if ((cmd == CMD_RESET) || if (cmd == CMD_RESET ||
(cmd == CMD_TERMINATE) || cmd == CMD_TERMINATE ||
(cmd == CMD_REPEAT)) { cmd == CMD_REPEAT) {
len2 = len + (NUM_SKIP_BYTES + NUM_RSP_BYTES + NUM_DUMMY_BYTES); len2 = len + (NUM_SKIP_BYTES + NUM_RSP_BYTES + NUM_DUMMY_BYTES);
} else if ((cmd == CMD_INTERNAL_READ) || (cmd == CMD_SINGLE_READ)) { } else if (cmd == CMD_INTERNAL_READ || cmd == CMD_SINGLE_READ) {
if (!g_spi.crc_off) { if (!g_spi.crc_off) {
len2 = len + (NUM_RSP_BYTES + NUM_DATA_HDR_BYTES + NUM_DATA_BYTES len2 = len + (NUM_RSP_BYTES + NUM_DATA_HDR_BYTES + NUM_DATA_BYTES
+ NUM_CRC_BYTES + NUM_DUMMY_BYTES); + NUM_CRC_BYTES + NUM_DUMMY_BYTES);
@ -425,9 +425,9 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
/** /**
* Command/Control response * Command/Control response
**/ **/
if ((cmd == CMD_RESET) || if (cmd == CMD_RESET ||
(cmd == CMD_TERMINATE) || cmd == CMD_TERMINATE ||
(cmd == CMD_REPEAT)) { cmd == CMD_REPEAT) {
rix++; /* skip 1 byte */ rix++; /* skip 1 byte */
} }
@ -453,8 +453,8 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
return N_FAIL; return N_FAIL;
} }
if ((cmd == CMD_INTERNAL_READ) || (cmd == CMD_SINGLE_READ) || if (cmd == CMD_INTERNAL_READ || cmd == CMD_SINGLE_READ ||
(cmd == CMD_DMA_READ) || (cmd == CMD_DMA_EXT_READ)) { cmd == CMD_DMA_READ || cmd == CMD_DMA_EXT_READ) {
int retry; int retry;
/* u16 crc1, crc2; */ /* u16 crc1, crc2; */
u8 crc[2]; u8 crc[2];
@ -480,7 +480,7 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
return N_RESET; return N_RESET;
} }
if ((cmd == CMD_INTERNAL_READ) || (cmd == CMD_SINGLE_READ)) { if (cmd == CMD_INTERNAL_READ || cmd == CMD_SINGLE_READ) {
/** /**
* Read bytes * Read bytes
**/ **/

26
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View File

@ -495,8 +495,8 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt,
connect_status = conn_info->status; connect_status = conn_info->status;
if ((mac_status == MAC_DISCONNECTED) && if (mac_status == MAC_DISCONNECTED &&
(conn_info->status == SUCCESSFUL_STATUSCODE)) { conn_info->status == SUCCESSFUL_STATUSCODE) {
connect_status = WLAN_STATUS_UNSPECIFIED_FAILURE; connect_status = WLAN_STATUS_UNSPECIFIED_FAILURE;
wilc_wlan_set_bssid(priv->dev, null_bssid, wilc_wlan_set_bssid(priv->dev, null_bssid,
STATION_MODE); STATION_MODE);
@ -548,9 +548,9 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt,
if (!wfi_drv->p2p_connect) if (!wfi_drv->p2p_connect)
wlan_channel = INVALID_CHANNEL; wlan_channel = INVALID_CHANNEL;
if ((wfi_drv->IFC_UP) && (dev == wl->vif[1]->ndev)) if (wfi_drv->IFC_UP && dev == wl->vif[1]->ndev)
disconn_info->reason = 3; disconn_info->reason = 3;
else if ((!wfi_drv->IFC_UP) && (dev == wl->vif[1]->ndev)) else if (!wfi_drv->IFC_UP && dev == wl->vif[1]->ndev)
disconn_info->reason = 1; disconn_info->reason = 1;
cfg80211_disconnected(dev, disconn_info->reason, disconn_info->ie, cfg80211_disconnected(dev, disconn_info->reason, disconn_info->ie,
@ -671,7 +671,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
wfi_drv->p2p_connect = 0; wfi_drv->p2p_connect = 0;
for (i = 0; i < last_scanned_cnt; i++) { for (i = 0; i < last_scanned_cnt; i++) {
if ((sme->ssid_len == last_scanned_shadow[i].ssid_len) && if (sme->ssid_len == last_scanned_shadow[i].ssid_len &&
memcmp(last_scanned_shadow[i].ssid, memcmp(last_scanned_shadow[i].ssid,
sme->ssid, sme->ssid,
sme->ssid_len) == 0) { sme->ssid_len) == 0) {
@ -932,7 +932,7 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
memcpy(priv->wilc_gtk[key_index]->key, params->key, params->key_len); memcpy(priv->wilc_gtk[key_index]->key, params->key, params->key_len);
kfree(priv->wilc_gtk[key_index]->seq); kfree(priv->wilc_gtk[key_index]->seq);
if ((params->seq_len) > 0) { if (params->seq_len > 0) {
priv->wilc_gtk[key_index]->seq = kmalloc(params->seq_len, GFP_KERNEL); priv->wilc_gtk[key_index]->seq = kmalloc(params->seq_len, GFP_KERNEL);
memcpy(priv->wilc_gtk[key_index]->seq, params->seq, params->seq_len); memcpy(priv->wilc_gtk[key_index]->seq, params->seq, params->seq_len);
} }
@ -964,12 +964,12 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
kfree(priv->wilc_ptk[key_index]->seq); kfree(priv->wilc_ptk[key_index]->seq);
if ((params->seq_len) > 0) if (params->seq_len > 0)
priv->wilc_ptk[key_index]->seq = kmalloc(params->seq_len, GFP_KERNEL); priv->wilc_ptk[key_index]->seq = kmalloc(params->seq_len, GFP_KERNEL);
memcpy(priv->wilc_ptk[key_index]->key, params->key, params->key_len); memcpy(priv->wilc_ptk[key_index]->key, params->key, params->key_len);
if ((params->seq_len) > 0) if (params->seq_len > 0)
memcpy(priv->wilc_ptk[key_index]->seq, params->seq, params->seq_len); memcpy(priv->wilc_ptk[key_index]->seq, params->seq, params->seq_len);
priv->wilc_ptk[key_index]->cipher = params->cipher; priv->wilc_ptk[key_index]->cipher = params->cipher;
@ -1082,7 +1082,7 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev,
kfree(g_key_wep_params.key); kfree(g_key_wep_params.key);
g_key_wep_params.key = NULL; g_key_wep_params.key = NULL;
if ((priv->wilc_gtk[key_index]) != NULL) { if (priv->wilc_gtk[key_index] != NULL) {
kfree(priv->wilc_gtk[key_index]->key); kfree(priv->wilc_gtk[key_index]->key);
priv->wilc_gtk[key_index]->key = NULL; priv->wilc_gtk[key_index]->key = NULL;
kfree(priv->wilc_gtk[key_index]->seq); kfree(priv->wilc_gtk[key_index]->seq);
@ -1092,7 +1092,7 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev,
priv->wilc_gtk[key_index] = NULL; priv->wilc_gtk[key_index] = NULL;
} }
if ((priv->wilc_ptk[key_index]) != NULL) { if (priv->wilc_ptk[key_index] != NULL) {
kfree(priv->wilc_ptk[key_index]->key); kfree(priv->wilc_ptk[key_index]->key);
priv->wilc_ptk[key_index]->key = NULL; priv->wilc_ptk[key_index]->key = NULL;
kfree(priv->wilc_ptk[key_index]->seq); kfree(priv->wilc_ptk[key_index]->seq);
@ -1216,8 +1216,8 @@ static int get_station(struct wiphy *wiphy, struct net_device *dev,
sinfo->tx_failed = stats.tx_fail_cnt; sinfo->tx_failed = stats.tx_fail_cnt;
sinfo->txrate.legacy = stats.link_speed * 10; sinfo->txrate.legacy = stats.link_speed * 10;
if ((stats.link_speed > TCP_ACK_FILTER_LINK_SPEED_THRESH) && if (stats.link_speed > TCP_ACK_FILTER_LINK_SPEED_THRESH &&
(stats.link_speed != DEFAULT_LINK_SPEED)) stats.link_speed != DEFAULT_LINK_SPEED)
wilc_enable_tcp_ack_filter(true); wilc_enable_tcp_ack_filter(true);
else if (stats.link_speed != DEFAULT_LINK_SPEED) else if (stats.link_speed != DEFAULT_LINK_SPEED)
wilc_enable_tcp_ack_filter(false); wilc_enable_tcp_ack_filter(false);
@ -1893,7 +1893,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
static int start_ap(struct wiphy *wiphy, struct net_device *dev, static int start_ap(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_ap_settings *settings) struct cfg80211_ap_settings *settings)
{ {
struct cfg80211_beacon_data *beacon = &(settings->beacon); struct cfg80211_beacon_data *beacon = &settings->beacon;
struct wilc_priv *priv; struct wilc_priv *priv;
s32 ret = 0; s32 ret = 0;
struct wilc *wl; struct wilc *wl;

2
drivers/staging/wilc1000/wilc_wlan.c
View File

@ -693,7 +693,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
i = 0; i = 0;
do { do {
tqe = wilc_wlan_txq_remove_from_head(dev); tqe = wilc_wlan_txq_remove_from_head(dev);
if (tqe && (vmm_table[i] != 0)) { if (tqe && vmm_table[i] != 0) {
u32 header, buffer_offset; u32 header, buffer_offset;
vmm_table[i] = cpu_to_le32(vmm_table[i]); vmm_table[i] = cpu_to_le32(vmm_table[i]);

6
drivers/staging/wilc1000/wilc_wlan_cfg.c
View File

@ -235,7 +235,7 @@ static int wilc_wlan_cfg_set_str(u8 *frame, u32 offset, u16 id, u8 *str, u32 siz
buf[2] = (u8)size; buf[2] = (u8)size;
buf[3] = (u8)(size >> 8); buf[3] = (u8)(size >> 8);
if ((str) && (size != 0)) if (str && size != 0)
memcpy(&buf[4], str, size); memcpy(&buf[4], str, size);
return (size + 4); return (size + 4);
@ -256,7 +256,7 @@ static int wilc_wlan_cfg_set_bin(u8 *frame, u32 offset, u16 id, u8 *b, u32 size)
buf[2] = (u8)size; buf[2] = (u8)size;
buf[3] = (u8)(size >> 8); buf[3] = (u8)(size >> 8);
if ((b) && (size != 0)) { if ((b) && size != 0) {
memcpy(&buf[4], b, size); memcpy(&buf[4], b, size);
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
checksum += buf[i + 4]; checksum += buf[i + 4];
@ -370,7 +370,7 @@ static int wilc_wlan_parse_info_frame(u8 *info, int size)
len = info[2]; len = info[2];
if ((len == 1) && (wid == WID_STATUS)) { if (len == 1 && wid == WID_STATUS) {
pd->mac_status = info[3]; pd->mac_status = info[3];
type = WILC_CFG_RSP_STATUS; type = WILC_CFG_RSP_STATUS;
} }