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

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

[Rakib Mullick]

 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 <rakib.mullick@gmail.com>
---

--- 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)

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

[Andrew Morton]

On Sun, 3 Jan 2010 19:27:56 +0600
Rakib Mullick <rakib.mullick@gmail.com> 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 <rakib.mullick@gmail.com>
> ---
> 
> --- 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?

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

[Rakib Mullick]

On 1/8/10, Andrew Morton <akpm@linux-foundation.org> 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.

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

[Alexey Starikovskiy]

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.

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

[Len Brown]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 488 bytes --]

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