Patchwork net: wireless/ath: Fix compile error seen with W=1

login
register
mail settings
Submitter Guenter Roeck
Date Jan. 27, 2013, 2:26 a.m.
Message ID <1359253568-15762-1-git-send-email-linux@roeck-us.net>
Download mbox | patch
Permalink /patch/215942/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Guenter Roeck - Jan. 27, 2013, 2:26 a.m.
make W=1 for x86_64 fails with

drivers/net/wireless/ath/wil6210/txrx.c: In function ‘wil_rx_fini’:
drivers/net/wireless/ath/wil6210/txrx.c:550:7: error: variable ‘rc’ set but not
used [-Werror=unused-but-set-variable]

Fix by dropping the variable.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 drivers/net/wireless/ath/wil6210/txrx.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Vladimir Kondratiev - Jan. 28, 2013, 10:55 a.m.
On Saturday, January 26, 2013 06:26:08 PM Guenter Roeck wrote:
> make W=1 for x86_64 fails with
> 
> drivers/net/wireless/ath/wil6210/txrx.c: In function ‘wil_rx_fini’:
> drivers/net/wireless/ath/wil6210/txrx.c:550:7: error: variable ‘rc’ set but not
> used [-Werror=unused-but-set-variable]
> 
> Fix by dropping the variable.
> 
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
>  drivers/net/wireless/ath/wil6210/txrx.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
> index f29c294..b6e8042 100644
> --- a/drivers/net/wireless/ath/wil6210/txrx.c
> +++ b/drivers/net/wireless/ath/wil6210/txrx.c
> @@ -547,7 +547,6 @@ void wil_rx_fini(struct wil6210_priv *wil)
>  	struct vring *vring = &wil->vring_rx;
>  
>  	if (vring->va) {
> -		int rc;
>  		struct wmi_cfg_rx_chain_cmd cmd = {
>  			.action = cpu_to_le32(WMI_RX_CHAIN_DEL),
>  			.rx_sw_ring = {
> @@ -559,7 +558,7 @@ void wil_rx_fini(struct wil6210_priv *wil)
>  			struct wmi_cfg_rx_chain_done_event cfg;
>  		} __packed wmi_rx_cfg_reply;
>  
> -		rc = wmi_call(wil, WMI_CFG_RX_CHAIN_CMDID, &cmd, sizeof(cmd),
> +		(void)wmi_call(wil, WMI_CFG_RX_CHAIN_CMDID, &cmd, sizeof(cmd),
>  			      WMI_CFG_RX_CHAIN_DONE_EVENTID,
>  			      &wmi_rx_cfg_reply, sizeof(wmi_rx_cfg_reply),
>  			      100);
> 

Thanks for finding it.

I will send series of new patches shortly. This will include changes in
rx chain initialization that, among other, remove fragment you fixed.
Reason is firmware API changes.

Thanks, Vladimir
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index f29c294..b6e8042 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -547,7 +547,6 @@  void wil_rx_fini(struct wil6210_priv *wil)
 	struct vring *vring = &wil->vring_rx;
 
 	if (vring->va) {
-		int rc;
 		struct wmi_cfg_rx_chain_cmd cmd = {
 			.action = cpu_to_le32(WMI_RX_CHAIN_DEL),
 			.rx_sw_ring = {
@@ -559,7 +558,7 @@  void wil_rx_fini(struct wil6210_priv *wil)
 			struct wmi_cfg_rx_chain_done_event cfg;
 		} __packed wmi_rx_cfg_reply;
 
-		rc = wmi_call(wil, WMI_CFG_RX_CHAIN_CMDID, &cmd, sizeof(cmd),
+		(void)wmi_call(wil, WMI_CFG_RX_CHAIN_CMDID, &cmd, sizeof(cmd),
 			      WMI_CFG_RX_CHAIN_DONE_EVENTID,
 			      &wmi_rx_cfg_reply, sizeof(wmi_rx_cfg_reply),
 			      100);