2024-04-03 08:18:51

by Arnd Bergmann

Subject: [PATCH 12/34] apm-emulation: hide an unused variable

From: Arnd Bergmann <[email protected]>

The driver_version variable is only used inside of an #ifdef block, which
leads to a W=1 warning:

drivers/char/apm-emulation.c:144:19: error: 'driver_version' defined but not used [-Werror=unused-const-variable=]

Move this into the function using it.

Fixes: 7726942fb15e ("[APM] Add shared version of APM emulation")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/char/apm-emulation.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index e795390b070f..53ce352f7197 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -141,9 +141,6 @@ static struct apm_queue kapmd_queue;

static DEFINE_MUTEX(state_lock);

-static const char driver_version[] = "1.13"; /* no spaces */
-
-

/*
* Compatibility cruft until the IPAQ people move over to the new
@@ -435,6 +432,8 @@ static struct miscdevice apm_device = {
*/
static int proc_apm_show(struct seq_file *m, void *v)
{
+ static const char driver_version[] = "1.13"; /* no spaces */
+
struct apm_power_info info;
char *units;

--
2.39.2

2024-04-03 12:23:36

by Jiri Kosina

Subject: Re: [PATCH 12/34] apm-emulation: hide an unused variable

On Wed, 3 Apr 2024, Arnd Bergmann wrote:

> From: Arnd Bergmann <[email protected]>
>
> The driver_version variable is only used inside of an #ifdef block, which
> leads to a W=1 warning:
>
> drivers/char/apm-emulation.c:144:19: error: 'driver_version' defined but not used [-Werror=unused-const-variable=]
>
> Move this into the function using it.
>
> Fixes: 7726942fb15e ("[APM] Add shared version of APM emulation")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/char/apm-emulation.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
> index e795390b070f..53ce352f7197 100644
> --- a/drivers/char/apm-emulation.c
> +++ b/drivers/char/apm-emulation.c
> @@ -141,9 +141,6 @@ static struct apm_queue kapmd_queue;
>
> static DEFINE_MUTEX(state_lock);
>
> -static const char driver_version[] = "1.13"; /* no spaces */
> -
> -
>
> /*
> * Compatibility cruft until the IPAQ people move over to the new
> @@ -435,6 +432,8 @@ static struct miscdevice apm_device = {
> */
> static int proc_apm_show(struct seq_file *m, void *v)
> {
> + static const char driver_version[] = "1.13"; /* no spaces */
> +
> struct apm_power_info info;
> char *units;

Heh, I really should mark this driver as Orphaned. Anyway, for this
particular patch:

Acked-by: Jiri Kosina <[email protected]>

--
Jiri Kosina
SUSE Labs