2014-12-21 13:57:06

by Mike Krinkin

Subject: [PATCH] staging: vt6655: fix sparse warnings: incorrect argument type

this patch fixes following sparse warnings:

drivers/staging/vt6655/device_main.c:1503:25: warning: incorrect type in argument 1 (different address spaces)
drivers/staging/vt6655/device_main.c:1503:25: expected void [noderef] <asn:2>*<noident>
drivers/staging/vt6655/device_main.c:1503:25: got struct vnt_private *
drivers/staging/vt6655/device_main.c:1503:25: warning: incorrect type in argument 2 (different address spaces)
drivers/staging/vt6655/device_main.c:1503:25: expected void [noderef] <asn:2>*<noident>
drivers/staging/vt6655/device_main.c:1503:25: got struct vnt_private *
drivers/staging/vt6655/device_main.c:1505:25: warning: incorrect type in argument 1 (different address spaces)
drivers/staging/vt6655/device_main.c:1505:25: expected void [noderef] <asn:2>*<noident>
drivers/staging/vt6655/device_main.c:1505:25: got struct vnt_private *
drivers/staging/vt6655/device_main.c:1505:25: warning: incorrect type in argument 2 (different address spaces)
drivers/staging/vt6655/device_main.c:1505:25: expected void [noderef] <asn:2>*<noident>
drivers/staging/vt6655/device_main.c:1505:25: got struct vnt_private *

Signed-off-by: Mike Krinkin <[email protected]>
---
drivers/staging/vt6655/device_main.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 83e4162..ce616f9 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1500,9 +1500,11 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
if (conf->enable_beacon) {
vnt_beacon_enable(priv, vif, conf);

- MACvRegBitsOn(priv, MAC_REG_TCR, TCR_AUTOBCNTX);
+ MACvRegBitsOn(priv->PortOffset, MAC_REG_TCR,
+ TCR_AUTOBCNTX);
} else {
- MACvRegBitsOff(priv, MAC_REG_TCR, TCR_AUTOBCNTX);
+ MACvRegBitsOff(priv->PortOffset, MAC_REG_TCR,
+ TCR_AUTOBCNTX);
}
}

--
1.9.1

2014-12-21 14:59:25

by Malcolm Priestley

Subject: Re: [PATCH] staging: vt6655: fix sparse warnings: incorrect argument type

On 21/12/14 13:56, Mike Krinkin wrote:
> this patch fixes following sparse warnings:
>
> drivers/staging/vt6655/device_main.c:1503:25: warning: incorrect type in argument 1 (different address spaces)
> drivers/staging/vt6655/device_main.c:1503:25: expected void [noderef] <asn:2>*<noident>
> drivers/staging/vt6655/device_main.c:1503:25: got struct vnt_private *
> drivers/staging/vt6655/device_main.c:1503:25: warning: incorrect type in argument 2 (different address spaces)
> drivers/staging/vt6655/device_main.c:1503:25: expected void [noderef] <asn:2>*<noident>
> drivers/staging/vt6655/device_main.c:1503:25: got struct vnt_private *
> drivers/staging/vt6655/device_main.c:1505:25: warning: incorrect type in argument 1 (different address spaces)
> drivers/staging/vt6655/device_main.c:1505:25: expected void [noderef] <asn:2>*<noident>
> drivers/staging/vt6655/device_main.c:1505:25: got struct vnt_private *
> drivers/staging/vt6655/device_main.c:1505:25: warning: incorrect type in argument 2 (different address spaces)
> drivers/staging/vt6655/device_main.c:1505:25: expected void [noderef] <asn:2>*<noident>
> drivers/staging/vt6655/device_main.c:1505:25: got struct vnt_private *
Good catch

also needed for 3.19

Thanks

Malcolm

>
> Signed-off-by: Mike Krinkin <[email protected]>
> ---
> drivers/staging/vt6655/device_main.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
> index 83e4162..ce616f9 100644
> --- a/drivers/staging/vt6655/device_main.c
> +++ b/drivers/staging/vt6655/device_main.c
> @@ -1500,9 +1500,11 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
> if (conf->enable_beacon) {
> vnt_beacon_enable(priv, vif, conf);
>
> - MACvRegBitsOn(priv, MAC_REG_TCR, TCR_AUTOBCNTX);
> + MACvRegBitsOn(priv->PortOffset, MAC_REG_TCR,
> + TCR_AUTOBCNTX);
> } else {
> - MACvRegBitsOff(priv, MAC_REG_TCR, TCR_AUTOBCNTX);
> + MACvRegBitsOff(priv->PortOffset, MAC_REG_TCR,
> + TCR_AUTOBCNTX);
> }
> }
>
>