Commit f7e02c8d authored by Hanjun Guo's avatar Hanjun Guo Committed by Rafael J. Wysocki
Browse files

ACPI: sbs: Unify the message printing 



Using pr_fmt() and pr_*() macros to unify the message printing.

While at it, fix the obvious coding style issue when scanning
the code.

Signed-off-by: default avatarHanjun Guo <guohanjun@huawei.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8acf4108

drivers/acpi/sbs.c

+6 −6
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 *  Copyright (c) 2005 Rich Townsend <rhdt@bartol.udel.edu>

 */



#define pr_fmt(fmt) "ACPI: " fmt



#include <linux/init.h>

#include <linux/slab.h>

#include <linux/module.h>
@@ -23,8 +25,6 @@ 


#include "sbshc.h"



#define PREFIX "ACPI: "



#define ACPI_SBS_CLASS			"sbs"

#define ACPI_AC_CLASS			"ac_adapter"

#define ACPI_SBS_DEVICE_NAME		"Smart Battery System"
@@ -544,7 +544,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) 
		goto end;

	battery->have_sysfs_alarm = 1;

      end:

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

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

	       ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),

	       battery->name, battery->present ? "present" : "absent");

	return result;
@@ -577,7 +577,7 @@ static int acpi_charger_add(struct acpi_sbs *sbs) 
		result = PTR_ERR(sbs->charger);

		sbs->charger = NULL;

	}

	printk(KERN_INFO PREFIX "%s [%s]: AC Adapter [%s] (%s)\n",

	pr_info("%s [%s]: AC Adapter [%s] (%s)\n",

	       ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),

	       ACPI_AC_DIR_NAME, sbs->charger_present ? "on-line" : "off-line");

end: