mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] ACPI / SBS: fix inconsistent indenting inside if statement
@ 2016-01-01 23:53 Colin King
  2016-01-05 12:58 ` Rafael J. Wysocki
  0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2016-01-01 23:53 UTC (permalink / raw)
  To: Rafael J . Wysocki, Len Brown, linux-acpi; +Cc: linux-kernel

From: Colin Ian King <colin.king@canonical.com>

The indenting in acpi_battery_set_alarm is inconsistent and has been
so since 2007; commit 94f6c0860139da9219255b8ff45ad42117dda859
("ACPI: SBS: Add support for power_supply class (and sysfs)"). Minor
fix for this, no code functionality change.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/acpi/sbs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index cb3dedb..ad0b13a 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -417,11 +417,11 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery)
 		if ((value & 0xf000) != sel) {
 			value &= 0x0fff;
 			value |= sel;
-		ret = acpi_smbus_write(sbs->hc, SMBUS_WRITE_WORD,
+			ret = acpi_smbus_write(sbs->hc, SMBUS_WRITE_WORD,
 					 ACPI_SBS_MANAGER,
 					 0x01, (u8 *)&value, 2);
-		if (ret)
-			goto end;
+			if (ret)
+				goto end;
 		}
 	}
 	ret = acpi_smbus_write(sbs->hc, SMBUS_WRITE_WORD, ACPI_SBS_BATTERY,
-- 
2.6.4


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] ACPI / SBS: fix inconsistent indenting inside if statement
  2016-01-01 23:53 [PATCH] ACPI / SBS: fix inconsistent indenting inside if statement Colin King
@ 2016-01-05 12:58 ` Rafael J. Wysocki
  0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2016-01-05 12:58 UTC (permalink / raw)
  To: Colin King; +Cc: Rafael J . Wysocki, Len Brown, linux-acpi, linux-kernel

On Friday, January 01, 2016 11:53:45 PM Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The indenting in acpi_battery_set_alarm is inconsistent and has been
> so since 2007; commit 94f6c0860139da9219255b8ff45ad42117dda859
> ("ACPI: SBS: Add support for power_supply class (and sysfs)"). Minor
> fix for this, no code functionality change.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied, thanks!

Rafael


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-01-05 12:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-01 23:53 [PATCH] ACPI / SBS: fix inconsistent indenting inside if statement Colin King
2016-01-05 12:58 ` Rafael J. Wysocki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®