Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd1fca9e authored by Dmitry Rozhkov's avatar Dmitry Rozhkov Committed by Rafael J. Wysocki
Browse files

ACPI / battery: use specialized print macros 



The kernel provides specialized macros for printing
info and warning messages which make the code shorter.

Use the specialized macros instead of bare printk()'s.

Also format one user visible string literal into a searchable one
line string.

Suggested-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 53dd200a

drivers/acpi/battery.c

+3 −5
Original line number Diff line number Diff line
@@ -577,8 +577,7 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 
		battery->rate_now != ACPI_BATTERY_VALUE_UNKNOWN &&

		(s16)(battery->rate_now) < 0) {

		battery->rate_now = abs((s16)battery->rate_now);

		printk_once(KERN_WARNING FW_BUG

			    "battery: (dis)charge rate invalid.\n");

		pr_warn_once(FW_BUG "battery: (dis)charge rate invalid.\n");

	}



	if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)
@@ -1170,8 +1169,7 @@ static const struct file_operations acpi_battery_alarm_fops = { 


static int acpi_battery_add_fs(struct acpi_device *device)

{

	printk(KERN_WARNING PREFIX "Deprecated procfs I/F for battery is loaded,"

			" please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");

	pr_warning(PREFIX "Deprecated procfs I/F for battery is loaded, please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");

	if (!acpi_device_dir(device)) {

		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),

						     acpi_battery_dir);
@@ -1398,7 +1396,7 @@ static int acpi_battery_add(struct acpi_device *device) 
	}

#endif



	printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",

	pr_info(PREFIX "%s Slot [%s] (battery %s)\n",

		ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),

		device->status.battery_present ? "present" : "absent");