Re: [2.6 patch] acpi/battery.c: remove dead code

Alexey Starikovskiy
2007-10-24T17:19:19Z

Adrian Bunk wrote:
> After commit f1d4661abe05d0a2c014166042d15ed8b69ae8f2 this was dead
> code.
>
> Spotted by the Coverity checker.
>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked. Thanks.
>
> ---
> --- linux-2.6/drivers/acpi/battery.c.old 2007-10-23 18:44:13.000000000 +0200
> +++ linux-2.6/drivers/acpi/battery.c 2007-10-23 18:44:43.000000000 +0200
> @@ -550,18 +550,14 @@ static ssize_t acpi_battery_write_alarm(
> int result = 0;
> char alarm_string[12] = { '\0' };
> struct seq_file *m = file->private_data;
> struct acpi_battery *battery = m->private;
>
> if (!battery || (count > sizeof(alarm_string) - 1))
> return -EINVAL;
> - if (result) {
> - result = -ENODEV;
> - goto end;
> - }
> if (!acpi_battery_present(battery)) {
> result = -ENODEV;
> goto end;
> }
> if (copy_from_user(alarm_string, buffer, count)) {
> result = -EFAULT;
> goto end;
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>