2010-01-03 13:27:59

by Rakib Mullick

Subject: [PATCH] acpi: Fix unused variable warning in sbs.c

Fix unused variabled warning.

When CONFIG_ACPI_SYSFS_POWER=n and CONFIG_ACPI_PROCFS_POWER=n, then
we're warned by the following warning:

drivers/acpi/sbs.c: In function `acpi_battery_remove':
drivers/acpi/sbs.c:825: warning: unused variable `battery'


Signed-off-by: Rakib Mullick <[email protected]>
---

--- linus/drivers/acpi/sbs.c 2009-12-28 12:37:29.000000000 +0600
+++ rakib/drivers/acpi/sbs.c 2010-01-03 11:29:07.000000000 +0600
@@ -822,7 +822,10 @@ static int acpi_battery_add(struct acpi_

static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
{
+#if defined(CONFIG_ACPI_SYSFS_POWER) || defined(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)

2010-01-07 22:52:14

by Andrew Morton

Subject: Re: [PATCH] acpi: Fix unused variable warning in sbs.c

On Sun, 3 Jan 2010 19:27:56 +0600
Rakib Mullick <[email protected]> wrote:

> Fix unused variabled warning.
>
> When CONFIG_ACPI_SYSFS_POWER=n and CONFIG_ACPI_PROCFS_POWER=n, then
> we're warned by the following warning:
>
> drivers/acpi/sbs.c: In function `acpi_battery_remove':
> drivers/acpi/sbs.c:825: warning: unused variable `battery'
>
>
> Signed-off-by: Rakib Mullick <[email protected]>
> ---
>
> --- linus/drivers/acpi/sbs.c 2009-12-28 12:37:29.000000000 +0600
> +++ rakib/drivers/acpi/sbs.c 2010-01-03 11:29:07.000000000 +0600
> @@ -822,7 +822,10 @@ static int acpi_battery_add(struct acpi_
>
> static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
> {
> +#if defined(CONFIG_ACPI_SYSFS_POWER) || defined(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)

Rather an unpleasant patch to a rather unpleasant function :( Oh well,
it's better than a warning.

I wonder if it can be fixed in Kconfig. Is there any sane use of
this code when CONFIG_ACPI_SYSFS_POWER=n && CONFIG_ACPI_PROCFS_POWER=n?

2010-01-08 07:04:11

by Rakib Mullick

Subject: Re: [PATCH] acpi: Fix unused variable warning in sbs.c

On 1/8/10, Andrew Morton <[email protected]> wrote:

>
> I wonder if it can be fixed in Kconfig. Is there any sane use of
> this code when CONFIG_ACPI_SYSFS_POWER=n && CONFIG_ACPI_PROCFS_POWER=n?
>
No. Making it depend on CONFIG_ACPI_SYSFS_POWER ||
CONFIG_ACPI_PROCFS_POWER, doesn't make sense too.
What about wrapping around acpi_battery_remove with #ifdef from
it's calling point.

2010-01-09 14:04:46

by Alexey Starikovskiy

Subject: Re: [PATCH] acpi: Fix unused variable warning in sbs.c

Andrew Morton пишет:
> I wonder if it can be fixed in Kconfig. Is there any sane use of
> this code when CONFIG_ACPI_SYSFS_POWER=n && CONFIG_ACPI_PROCFS_POWER=n?
No, this driver is useless in such a case. It can not output any info (and this is all it does).

Regards,
Alex.

2010-01-16 21:03:14

by Len Brown

Subject: Re: [PATCH] acpi: Fix unused variable warning in sbs.c

On Sat, 9 Jan 2010, Alexey Starikovskiy wrote:

> Andrew Morton пишет:
> > I wonder if it can be fixed in Kconfig. Is there any sane use of
> > this code when CONFIG_ACPI_SYSFS_POWER=n && CONFIG_ACPI_PROCFS_POWER=n?

> No, this driver is useless in such a case. It can not output any info (and this is all it does).


Hi Alex,
Probably the code can lose some ifdefs by doing things
like making acpi_battery_remove_fs() a static inline when
!CONFIG_ACPI_PROCFS_POWER.

cheers,
-Len