aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/battery.c
diff options
context:
space:
mode:
authorNicholas Mazzuca <nicholas@mazzucastuff.com>2013-05-08 19:11:15 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-19 17:34:58 -0400
commit0f4c65478d2ac03296415a5bdac1ead3e24cfc5b (patch)
tree12dbe4cfc32d79920cfec50d0f5a598993385367 /drivers/acpi/battery.c
parentc7d9ca90aa9497f0b6e301ec67c52dd4b57a7852 (diff)
ACPI / battery: Make sure all spaces are in correct places
Add or remove spaces that give errors or warnings from checkpatch.pl. Signed-off-by: Nicholas Mazzuca <nicholas@mazzucastuff.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/battery.c')
-rw-r--r--drivers/acpi/battery.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index e7100459ac4a..082b4dd252a8 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -425,7 +425,7 @@ static int acpi_battery_get_info(struct acpi_battery *battery)
425{ 425{
426 int result = -EFAULT; 426 int result = -EFAULT;
427 acpi_status status = 0; 427 acpi_status status = 0;
428 char *name = test_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags)? 428 char *name = test_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags) ?
429 "_BIX" : "_BIF"; 429 "_BIX" : "_BIF";
430 430
431 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; 431 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -661,11 +661,11 @@ static void find_battery(const struct dmi_header *dm, void *private)
661static void acpi_battery_quirks(struct acpi_battery *battery) 661static void acpi_battery_quirks(struct acpi_battery *battery)
662{ 662{
663 if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)) 663 if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))
664 return ; 664 return;
665 665
666 if (battery->full_charge_capacity == 100 && 666 if (battery->full_charge_capacity == 100 &&
667 battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN && 667 battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN &&
668 battery->capacity_now >=0 && battery->capacity_now <= 100) { 668 battery->capacity_now >= 0 && battery->capacity_now <= 100) {
669 set_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags); 669 set_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags);
670 battery->full_charge_capacity = battery->design_capacity; 670 battery->full_charge_capacity = battery->design_capacity;
671 battery->capacity_now = (battery->capacity_now * 671 battery->capacity_now = (battery->capacity_now *
@@ -673,7 +673,7 @@ static void acpi_battery_quirks(struct acpi_battery *battery)
673 } 673 }
674 674
675 if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags)) 675 if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags))
676 return ; 676 return;
677 677
678 if (battery->power_unit && dmi_name_in_vendors("LENOVO")) { 678 if (battery->power_unit && dmi_name_in_vendors("LENOVO")) {
679 const char *s; 679 const char *s;
@@ -761,7 +761,7 @@ static int acpi_battery_print_info(struct seq_file *seq, int result)
761 goto end; 761 goto end;
762 762
763 seq_printf(seq, "present: %s\n", 763 seq_printf(seq, "present: %s\n",
764 acpi_battery_present(battery)?"yes":"no"); 764 acpi_battery_present(battery) ? "yes" : "no");
765 if (!acpi_battery_present(battery)) 765 if (!acpi_battery_present(battery))
766 goto end; 766 goto end;
767 if (battery->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN) 767 if (battery->design_capacity == ACPI_BATTERY_VALUE_UNKNOWN)
@@ -817,12 +817,12 @@ static int acpi_battery_print_state(struct seq_file *seq, int result)
817 goto end; 817 goto end;
818 818
819 seq_printf(seq, "present: %s\n", 819 seq_printf(seq, "present: %s\n",
820 acpi_battery_present(battery)?"yes":"no"); 820 acpi_battery_present(battery) ? "yes" : "no");
821 if (!acpi_battery_present(battery)) 821 if (!acpi_battery_present(battery))
822 goto end; 822 goto end;
823 823
824 seq_printf(seq, "capacity state: %s\n", 824 seq_printf(seq, "capacity state: %s\n",
825 (battery->state & 0x04)?"critical":"ok"); 825 (battery->state & 0x04) ? "critical" : "ok");
826 if ((battery->state & 0x01) && (battery->state & 0x02)) 826 if ((battery->state & 0x01) && (battery->state & 0x02))
827 seq_printf(seq, 827 seq_printf(seq,
828 "charging state: charging/discharging\n"); 828 "charging state: charging/discharging\n");