2014-06-24 20:57:50

by Clement Calmels

Subject: [PATCH] staging: rtl8723au: fix sparse warning

From: Clément Calmels <[email protected]>

Found running sparse on the rtl8723au driver.

CHECK drivers/staging/rtl8723au/core/rtw_cmd.c
drivers/staging/rtl8723au/core/rtw_cmd.c:1479:54: warning: incorrect type in argument 2 (different base types)
drivers/staging/rtl8723au/core/rtw_cmd.c:1479:54: expected int [signed] gfp
drivers/staging/rtl8723au/core/rtw_cmd.c:1479:54: got restricted gfp_t

Signed-off-by: Clement Calmels <[email protected]>
---
drivers/staging/rtl8723au/core/rtw_mlme.c | 2 +-
drivers/staging/rtl8723au/include/rtw_mlme.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 7170258..c6f4e47 100644
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -125,7 +125,7 @@ void rtw_free_mlme_priv23a(struct mlme_priv *pmlmepriv)
rtw23a_free_mlme_priv_ie_data(pmlmepriv);
}

-struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv, int gfp)
+struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv, gfp_t gfp)
{
struct wlan_network *pnetwork;

diff --git a/drivers/staging/rtl8723au/include/rtw_mlme.h b/drivers/staging/rtl8723au/include/rtw_mlme.h
index 4d327ba..f798078 100644
--- a/drivers/staging/rtl8723au/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723au/include/rtw_mlme.h
@@ -344,7 +344,7 @@ void rtw23a_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);

void _rtw_free_mlme_priv23a(struct mlme_priv *pmlmepriv);

-struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv, int gfp);
+struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv, gfp_t gfp);

int rtw_if_up23a(struct rtw_adapter *padapter);

--
2.0.0

2014-06-24 22:08:03

by Jes Sorensen

Subject: Re: [PATCH] staging: rtl8723au: fix sparse warning

Clement Calmels <[email protected]> writes:
> From: Clément Calmels <[email protected]>
>
> Found running sparse on the rtl8723au driver.
>
> CHECK drivers/staging/rtl8723au/core/rtw_cmd.c
> drivers/staging/rtl8723au/core/rtw_cmd.c:1479:54: warning: incorrect type in argument 2 (different base types)
> drivers/staging/rtl8723au/core/rtw_cmd.c:1479:54: expected int [signed] gfp
> drivers/staging/rtl8723au/core/rtw_cmd.c:1479:54: got restricted gfp_t
>
> Signed-off-by: Clement Calmels <[email protected]>
> ---
> drivers/staging/rtl8723au/core/rtw_mlme.c | 2 +-
> drivers/staging/rtl8723au/include/rtw_mlme.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)

Thanks, I'll add it to my tree!

Cheers,
Jes