openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: wilc1000: remove 'flag' argument from wilc_mac_indicate() 

Remove 'flag' function parameter in wilc_mac_indicate() as only one
condition was handled using that parameter. Also removed unnecessary
call to wilc_mac_indicate() as no operation was performed in that
function call.
After above changes below macros are not required anymore.
WILC_MAC_INDICATE_STATUS	0x1
WILC_MAC_INDICATE_SCAN		0x2

This changes also helped in resolving the line over 80 chars issue
found by checkatpch.pl script.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh 2018-05-11 13:43:27 +05:30 committed by Greg Kroah-Hartman
parent 2e530e2836
commit c7ceac21e7
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,19 +176,16 @@ static void deinit_irq(struct net_device *dev)
}
}
void wilc_mac_indicate(struct wilc *wilc, int flag)
void wilc_mac_indicate(struct wilc *wilc)
{
int status;
if (flag == WILC_MAC_INDICATE_STATUS) {
wilc_wlan_cfg_get_val(WID_STATUS,
(unsigned char *)&status, 4);
if (wilc->mac_status == MAC_STATUS_INIT) {
wilc->mac_status = status;
complete(&wilc->sync_event);
} else {
wilc->mac_status = status;
}
wilc_wlan_cfg_get_val(WID_STATUS, (unsigned char *)&status, 4);
if (wilc->mac_status == MAC_STATUS_INIT) {
wilc->mac_status = status;
complete(&wilc->sync_event);
} else {
wilc->mac_status = status;
}
}

2
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View File

@ -182,7 +182,7 @@ struct wilc_wfi_mon_priv {
};
void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset);
void wilc_mac_indicate(struct wilc *wilc, int flag);
void wilc_mac_indicate(struct wilc *wilc);
void wilc_netdev_cleanup(struct wilc *wilc);
int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
int gpio, const struct wilc_hif_func *ops);

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

@ -816,12 +816,7 @@ static void wilc_wlan_handle_rx_buff(struct wilc *wilc, u8 *buffer, int size)
if (wilc->cfg_seq_no == rsp.seq_no)
complete(&wilc->cfg_event);
} else if (rsp.type == WILC_CFG_RSP_STATUS) {
wilc_mac_indicate(wilc,
WILC_MAC_INDICATE_STATUS);
} else if (rsp.type == WILC_CFG_RSP_SCAN) {
wilc_mac_indicate(wilc,
WILC_MAC_INDICATE_SCAN);
wilc_mac_indicate(wilc);
}
}
}

3
drivers/staging/wilc1000/wilc_wlan_if.h
View File

@ -47,9 +47,6 @@ struct sdio_cmd53 {
u32 block_size;
};
#define WILC_MAC_INDICATE_STATUS 0x1
#define WILC_MAC_INDICATE_SCAN 0x2
#define MAC_STATUS_INIT -1
#define MAC_STATUS_CONNECTED 1
#define MAC_STATUS_DISCONNECTED 0