diff mbox series

[v2,-next] memory: omap-gpmc: Fix -Wunused-function warnings

Message ID 20200901070945.23792-1-yuehaibing@huawei.com
State New
Headers show
Series [v2,-next] memory: omap-gpmc: Fix -Wunused-function warnings | expand

Commit Message

YueHaibing Sept. 1, 2020, 7:09 a.m. UTC
If CONFIG_OF is not set, make W=1 warns:

drivers/memory/omap-gpmc.c:987:12: warning: ‘gpmc_cs_remap’ defined but not used [-Wunused-function]
 static int gpmc_cs_remap(int cs, u32 base)
            ^~~~~~~~~~~~~
drivers/memory/omap-gpmc.c:926:20: warning: ‘gpmc_cs_get_name’ defined but not used [-Wunused-function]
 static const char *gpmc_cs_get_name(int cs)
                    ^~~~~~~~~~~~~~~~
drivers/memory/omap-gpmc.c:919:13: warning: ‘gpmc_cs_set_name’ defined but not used [-Wunused-function]
 static void gpmc_cs_set_name(int cs, const char *name)
             ^~~~~~~~~~~~~~~~
Make them as  __maybe_unused to fix this.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
v2: update commit log
---
 drivers/memory/omap-gpmc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Roger Quadros Sept. 1, 2020, 11:14 a.m. UTC | #1
Hi,

On 01/09/2020 10:09, YueHaibing wrote:
> If CONFIG_OF is not set, make W=1 warns:
> 
> drivers/memory/omap-gpmc.c:987:12: warning: ‘gpmc_cs_remap’ defined but not used [-Wunused-function]
>   static int gpmc_cs_remap(int cs, u32 base)
>              ^~~~~~~~~~~~~
> drivers/memory/omap-gpmc.c:926:20: warning: ‘gpmc_cs_get_name’ defined but not used [-Wunused-function]
>   static const char *gpmc_cs_get_name(int cs)
>                      ^~~~~~~~~~~~~~~~
> drivers/memory/omap-gpmc.c:919:13: warning: ‘gpmc_cs_set_name’ defined but not used [-Wunused-function]
>   static void gpmc_cs_set_name(int cs, const char *name)
>               ^~~~~~~~~~~~~~~~
> Make them as  __maybe_unused to fix this.

Instead of that how about moving those 3 functions to within
#ifdef CONFIG_OF
#endif

like gpmc_probe_generic_child()

We are absolutely sure they are not required if CONFIG_OF isn't defined.

cheers,
-roger

> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
> v2: update commit log
> ---
>   drivers/memory/omap-gpmc.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
> index ac0f577a51a1..24372254986e 100644
> --- a/drivers/memory/omap-gpmc.c
> +++ b/drivers/memory/omap-gpmc.c
> @@ -916,14 +916,14 @@ static bool gpmc_cs_reserved(int cs)
>   	return gpmc->flags & GPMC_CS_RESERVED;
>   }
>   
> -static void gpmc_cs_set_name(int cs, const char *name)
> +static void __maybe_unused gpmc_cs_set_name(int cs, const char *name)
>   {
>   	struct gpmc_cs_data *gpmc = &gpmc_cs[cs];
>   
>   	gpmc->name = name;
>   }
>   
> -static const char *gpmc_cs_get_name(int cs)
> +static const __maybe_unused char *gpmc_cs_get_name(int cs)
>   {
>   	struct gpmc_cs_data *gpmc = &gpmc_cs[cs];
>   
> @@ -984,7 +984,7 @@ static int gpmc_cs_delete_mem(int cs)
>    * "base". Returns 0 on success and appropriate negative error code
>    * on failure.
>    */
> -static int gpmc_cs_remap(int cs, u32 base)
> +static int __maybe_unused gpmc_cs_remap(int cs, u32 base)
>   {
>   	int ret;
>   	u32 old_base, size;
>
diff mbox series

Patch

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index ac0f577a51a1..24372254986e 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -916,14 +916,14 @@  static bool gpmc_cs_reserved(int cs)
 	return gpmc->flags & GPMC_CS_RESERVED;
 }
 
-static void gpmc_cs_set_name(int cs, const char *name)
+static void __maybe_unused gpmc_cs_set_name(int cs, const char *name)
 {
 	struct gpmc_cs_data *gpmc = &gpmc_cs[cs];
 
 	gpmc->name = name;
 }
 
-static const char *gpmc_cs_get_name(int cs)
+static const __maybe_unused char *gpmc_cs_get_name(int cs)
 {
 	struct gpmc_cs_data *gpmc = &gpmc_cs[cs];
 
@@ -984,7 +984,7 @@  static int gpmc_cs_delete_mem(int cs)
  * "base". Returns 0 on success and appropriate negative error code
  * on failure.
  */
-static int gpmc_cs_remap(int cs, u32 base)
+static int __maybe_unused gpmc_cs_remap(int cs, u32 base)
 {
 	int ret;
 	u32 old_base, size;