[PATCH 1/2] Staging: ks7010: mark symbols static where possible

[PATCH 1/2] Staging: ks7010: mark symbols static where possible

[Baoyou Xie]

We get 3 warnings when building kernel with W=1:
drivers/staging/ks7010/ks7010_sdio.c:90:6: warning: no previous prototype for 'ks_wlan_hw_sleep_doze_request' [-Wmissing-prototypes]
drivers/staging/ks7010/ks7010_sdio.c:120:6: warning: no previous prototype for 'ks_wlan_hw_sleep_wakeup_request' [-Wmissing-prototypes]
drivers/staging/ks7010/ks7010_sdio.c:172:5: warning: no previous prototype for '_ks_wlan_hw_power_save' [-Wmissing-prototypes]

In fact, these functions are only used in the file in which they are
declared and don't need a declaration, but can be made static.
so this patch marks these functions with 'static'.

Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
---
 drivers/staging/ks7010/ks7010_sdio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c
index 25ad43d..9442532 100644
--- a/drivers/staging/ks7010/ks7010_sdio.c
+++ b/drivers/staging/ks7010/ks7010_sdio.c
@@ -87,7 +87,7 @@ static int ks7010_sdio_write(struct ks_wlan_private *priv, unsigned int address,
 	return rc;
 }
 
-void ks_wlan_hw_sleep_doze_request(struct ks_wlan_private *priv)
+static void ks_wlan_hw_sleep_doze_request(struct ks_wlan_private *priv)
 {
 	unsigned char rw_data;
 	int retval;
@@ -117,7 +117,7 @@ void ks_wlan_hw_sleep_doze_request(struct ks_wlan_private *priv)
 	priv->sleep_mode = atomic_read(&priv->sleepstatus.status);
 }
 
-void ks_wlan_hw_sleep_wakeup_request(struct ks_wlan_private *priv)
+static void ks_wlan_hw_sleep_wakeup_request(struct ks_wlan_private *priv)
 {
 	unsigned char rw_data;
 	int retval;
@@ -169,7 +169,7 @@ void ks_wlan_hw_wakeup_request(struct ks_wlan_private *priv)
 	}
 }
 
-int _ks_wlan_hw_power_save(struct ks_wlan_private *priv)
+static int _ks_wlan_hw_power_save(struct ks_wlan_private *priv)
 {
 	int rc = 0;
 	unsigned char rw_data;
-- 
2.7.4

Re: [PATCH 1/2] Staging: ks7010: mark symbols static where possible

[Greg KH]

On Fri, Sep 23, 2016 at 09:22:29PM +0800, Baoyou Xie wrote:
> We get 3 warnings when building kernel with W=1:
> drivers/staging/ks7010/ks7010_sdio.c:90:6: warning: no previous prototype for 'ks_wlan_hw_sleep_doze_request' [-Wmissing-prototypes]
> drivers/staging/ks7010/ks7010_sdio.c:120:6: warning: no previous prototype for 'ks_wlan_hw_sleep_wakeup_request' [-Wmissing-prototypes]
> drivers/staging/ks7010/ks7010_sdio.c:172:5: warning: no previous prototype for '_ks_wlan_hw_power_save' [-Wmissing-prototypes]
> 
> In fact, these functions are only used in the file in which they are
> declared and don't need a declaration, but can be made static.
> so this patch marks these functions with 'static'.
> 
> Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> ---
>  drivers/staging/ks7010/ks7010_sdio.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Does not apply cleanly, are you sure you are using the latest tree?

Can you fix it up and resend?

thanks,

greg k-h

Re: [PATCH 1/2] Staging: ks7010: mark symbols static where possible

[Arnd Bergmann]

On Saturday, September 24, 2016 9:34:41 AM CEST Baoyou Xie wrote:
> On 24 September 2016 at 01:10, Greg KH <gregkh@linuxfoundation.org> wrote:
> 
> > On Fri, Sep 23, 2016 at 09:22:29PM +0800, Baoyou Xie wrote:
> > > We get 3 warnings when building kernel with W=1:
> > > drivers/staging/ks7010/ks7010_sdio.c:90:6: warning: no previous
> > prototype for 'ks_wlan_hw_sleep_doze_request' [-Wmissing-prototypes]
> > > drivers/staging/ks7010/ks7010_sdio.c:120:6: warning: no previous
> > prototype for 'ks_wlan_hw_sleep_wakeup_request' [-Wmissing-prototypes]
> > > drivers/staging/ks7010/ks7010_sdio.c:172:5: warning: no previous
> > prototype for '_ks_wlan_hw_power_save' [-Wmissing-prototypes]
> > >
> > > In fact, these functions are only used in the file in which they are
> > > declared and don't need a declaration, but can be made static.
> > > so this patch marks these functions with 'static'.
> > >
> > > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> > > ---
> > >  drivers/staging/ks7010/ks7010_sdio.c | 6 +++---
> > >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > Does not apply cleanly, are you sure you are using the latest tree?
> >
> I worked on linux next-20160922 tag, could you tell me how to find the
> valid tree?

The file saw a couple of small changes in next-20160923, so I think
this was just unfortunate timing but you used the right tree.

staging can be moving very rapidly at times, so if you want to
be sure to get the right tree of the minute, you can
rebase on top of

git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging-testing

I usually just base on top of the linux-next of the day, which tends
to work well enough.

	Arnd