memstick r592: make memstick_debug_get_tpc_name() static

Message ID 20230516202714.560929-1-arnd@kernel.org
State New
Headers
Series memstick r592: make memstick_debug_get_tpc_name() static |

Commit Message

Arnd Bergmann May 16, 2023, 8:27 p.m. UTC
  From: Arnd Bergmann <arnd@arndb.de>

There are no other files referencing this function, apparently
it was left global to avoid an 'unused function' warning when
the only caller is left out. With a 'W=1' build, it causes
a 'missing prototype' warning though:

drivers/memstick/host/r592.c:47:13: error: no previous prototype for 'memstick_debug_get_tpc_name' [-Werror=missing-prototypes]

Annotate the function as 'static __maybe_unused' to avoid both
problems.

Fixes: 926341250102 ("memstick: add driver for Ricoh R5C592 card reader")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/memstick/host/r592.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
  

Comments

Ulf Hansson May 24, 2023, 1:10 p.m. UTC | #1
On Tue, 16 May 2023 at 22:27, Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> There are no other files referencing this function, apparently
> it was left global to avoid an 'unused function' warning when
> the only caller is left out. With a 'W=1' build, it causes
> a 'missing prototype' warning though:
>
> drivers/memstick/host/r592.c:47:13: error: no previous prototype for 'memstick_debug_get_tpc_name' [-Werror=missing-prototypes]
>
> Annotate the function as 'static __maybe_unused' to avoid both
> problems.
>
> Fixes: 926341250102 ("memstick: add driver for Ricoh R5C592 card reader")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/memstick/host/r592.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
> index 42bfc46842b8..461f5ffd02bc 100644
> --- a/drivers/memstick/host/r592.c
> +++ b/drivers/memstick/host/r592.c
> @@ -44,12 +44,10 @@ static const char *tpc_names[] = {
>   * memstick_debug_get_tpc_name - debug helper that returns string for
>   * a TPC number
>   */
> -const char *memstick_debug_get_tpc_name(int tpc)
> +static __maybe_unused const char *memstick_debug_get_tpc_name(int tpc)
>  {
>         return tpc_names[tpc-1];
>  }
> -EXPORT_SYMBOL(memstick_debug_get_tpc_name);
> -
>
>  /* Read a register*/
>  static inline u32 r592_read_reg(struct r592_device *dev, int address)
> --
> 2.39.2
>
  

Patch

diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 42bfc46842b8..461f5ffd02bc 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -44,12 +44,10 @@  static const char *tpc_names[] = {
  * memstick_debug_get_tpc_name - debug helper that returns string for
  * a TPC number
  */
-const char *memstick_debug_get_tpc_name(int tpc)
+static __maybe_unused const char *memstick_debug_get_tpc_name(int tpc)
 {
 	return tpc_names[tpc-1];
 }
-EXPORT_SYMBOL(memstick_debug_get_tpc_name);
-
 
 /* Read a register*/
 static inline u32 r592_read_reg(struct r592_device *dev, int address)