2008-08-03 07:24:39

by Manish Katiyar

Subject: [PATCH] Remove warning 'unused variable battery' in drivers/acpi/sbs.c

Below patch removes the following warning:
drivers/acpi/sbs.c: In function 'acpi_battery_remove':
drivers/acpi/sbs.c:819: warning: unused variable 'battery'



Signed-off-by:- "Manish Katiyar" <[email protected]>

---
drivers/acpi/sbs.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 10a3651..8493603 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -816,7 +816,9 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)

static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
{
+#ifdef CONFIG_ACPI_SYSFS_POWER || CONFIG_ACPI_PROCFS_POWER
struct acpi_battery *battery = &sbs->battery[id];
+#endif
#ifdef CONFIG_ACPI_SYSFS_POWER
if (battery->bat.dev) {
if (battery->have_sysfs_alarm)
--
1.5.4.3



Thanks -
Manish

2008-08-03 12:30:35

by Ilpo Järvinen

Subject: Re: [PATCH] Remove warning 'unused variable battery' in drivers/acpi/sbs.c

On Sun, 3 Aug 2008, Manish Katiyar wrote:

> Below patch removes the following warning:
> drivers/acpi/sbs.c: In function 'acpi_battery_remove':
> drivers/acpi/sbs.c:819: warning: unused variable 'battery'
>
>
>
> Signed-off-by:- "Manish Katiyar" <[email protected]>
>
> ---
> drivers/acpi/sbs.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
> index 10a3651..8493603 100644
> --- a/drivers/acpi/sbs.c
> +++ b/drivers/acpi/sbs.c
> @@ -816,7 +816,9 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
>
> static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
> {
> +#ifdef CONFIG_ACPI_SYSFS_POWER || CONFIG_ACPI_PROCFS_POWER

I don't think you can use || operator in ifdef like that... ...Try
#if defined(...) || (...) instead.


--
i.

2008-08-03 20:18:20

by Randy Dunlap

Subject: Re: [PATCH] Remove warning 'unused variable battery' in drivers/acpi/sbs.c

On Sun, 3 Aug 2008, Ilpo J?rvinen wrote:

> On Sun, 3 Aug 2008, Manish Katiyar wrote:
>
> > Below patch removes the following warning:
> > drivers/acpi/sbs.c: In function 'acpi_battery_remove':
> > drivers/acpi/sbs.c:819: warning: unused variable 'battery'
> >
> >
> >
> > Signed-off-by:- "Manish Katiyar" <[email protected]>
> >
> > ---
> > drivers/acpi/sbs.c | 2 ++
> > 1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
> > index 10a3651..8493603 100644
> > --- a/drivers/acpi/sbs.c
> > +++ b/drivers/acpi/sbs.c
> > @@ -816,7 +816,9 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
> >
> > static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
> > {
> > +#ifdef CONFIG_ACPI_SYSFS_POWER || CONFIG_ACPI_PROCFS_POWER
>
> I don't think you can use || operator in ifdef like that... ...Try
> #if defined(...) || (...) instead.


Did the patch sumbitter try to build this with the patch in place???

--
~Randy