Commit 8b457d60 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-dptf' and 'acpi-messages' 

* acpi-dptf:
  ACPI: DPTF: Add battery participant for Intel SoCs

* acpi-messages:
  ACPI: Remove the macro PREFIX "ACPI: "
  ACPI: sleep: Unify the message printing
  ACPI: sbs: Unify the message printing
  ACPI: scan: Unify the log message printing
  ACPI: sbshc: Unify the message printing
  ACPI: sysfs: Cleanup message printing
  ACPI: reboot: Unify the message printing
  ACPI: processor_throttling: Cleanup the printing messages
  ACPI: processor_perflib: Cleanup print messages
  ACPI: processor_thermal: Remove unused PREFIX for printing
  ACPI: pci_root: Unify the message printing
  ACPI: osl: Remove the duplicated PREFIX for message printing
  ACPI: nvs: Unify the message printing
  ACPI: glue: Clean up the printing messages
  ACPI: event: Use pr_*() macros to replace printk()
  ACPI: bus: Use pr_*() macros to replace printk()
  ACPI: blacklist: Unify the message printing
  ACPI: cmos_rtc: Using pr_fmt() and remove PREFIX
parents 3a616ec7 7d966119 0ac2c0e4

drivers/acpi/acpi_cmos_rtc.c

+4 −2
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
 * Authors: Lan Tianyu <tianyu.lan@intel.com>

 */



#define pr_fmt(fmt) "ACPI: " fmt



#include <linux/acpi.h>

#include <linux/device.h>

#include <linux/err.h>
@@ -59,7 +61,7 @@ static int acpi_install_cmos_rtc_space_handler(struct acpi_device *adev, 
			&acpi_cmos_rtc_space_handler,

			NULL, NULL);

	if (ACPI_FAILURE(status)) {

		pr_err(PREFIX "Error installing CMOS-RTC region handler\n");

		pr_err("Error installing CMOS-RTC region handler\n");

		return -ENODEV;

	}
@@ -70,7 +72,7 @@ static void acpi_remove_cmos_rtc_space_handler(struct acpi_device *adev) 
{

	if (ACPI_FAILURE(acpi_remove_address_space_handler(adev->handle,

			ACPI_ADR_SPACE_CMOS, &acpi_cmos_rtc_space_handler)))

		pr_err(PREFIX "Error removing CMOS-RTC region handler\n");

		pr_err("Error removing CMOS-RTC region handler\n");

}



static struct acpi_scan_handler cmos_rtc_handler = {

drivers/acpi/blacklist.c

+5 −4
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
 *  Copyright (C) 2002 Andy Grover <andrew.grover@intel.com>

 */



#define pr_fmt(fmt) "ACPI: " fmt



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/acpi.h>
@@ -49,12 +51,12 @@ int __init acpi_blacklisted(void) 


	i = acpi_match_platform_list(acpi_blacklist);

	if (i >= 0) {

		pr_err(PREFIX "Vendor \"%6.6s\" System \"%8.8s\" Revision 0x%x has a known ACPI BIOS problem.\n",

		pr_err("Vendor \"%6.6s\" System \"%8.8s\" Revision 0x%x has a known ACPI BIOS problem.\n",

		       acpi_blacklist[i].oem_id,

		       acpi_blacklist[i].oem_table_id,

		       acpi_blacklist[i].oem_revision);



		pr_err(PREFIX "Reason: %s. This is a %s error\n",

		pr_err("Reason: %s. This is a %s error\n",

		       acpi_blacklist[i].reason,

		       (acpi_blacklist[i].data ?

			"non-recoverable" : "recoverable"));
@@ -73,8 +75,7 @@ int __init acpi_blacklisted(void) 
#ifdef CONFIG_ACPI_REV_OVERRIDE_POSSIBLE

static int __init dmi_enable_rev_override(const struct dmi_system_id *d)

{

	printk(KERN_NOTICE PREFIX "DMI detected: %s (force ACPI _REV to 5)\n",

	       d->ident);

	pr_notice("DMI detected: %s (force ACPI _REV to 5)\n", d->ident);

	acpi_rev_override_setup(NULL);

	return 0;

}

drivers/acpi/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ EXPORT_SYMBOL_GPL(osc_sb_native_usb4_control); 


static void acpi_bus_decode_usb_osc(const char *msg, u32 bits)

{

	printk(KERN_INFO PREFIX "%s USB3%c DisplayPort%c PCIe%c XDomain%c\n", msg,

	pr_info("%s USB3%c DisplayPort%c PCIe%c XDomain%c\n", msg,

	       (bits & OSC_USB_USB3_TUNNELING) ? '+' : '-',

	       (bits & OSC_USB_DP_TUNNELING) ? '+' : '-',

	       (bits & OSC_USB_PCIE_TUNNELING) ? '+' : '-',
@@ -398,7 +398,7 @@ static void acpi_bus_osc_negotiate_usb_control(void) 
		return;



	if (context.ret.length != sizeof(capbuf)) {

		printk(KERN_INFO PREFIX "USB4 _OSC: returned invalid length buffer\n");

		pr_info("USB4 _OSC: returned invalid length buffer\n");

		goto out_free;

	}

drivers/acpi/dptf/int340x_thermal.c

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = { 
	{"INT3409"},

	{"INT340A"},

	{"INT340B"},

	{"INT3532"},

	{"INTC1040"},

	{"INTC1041"},

	{"INTC1043"},
@@ -33,6 +34,7 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = { 
	{"INTC1047"},

	{"INTC1048"},

	{"INTC1049"},

	{"INTC1050"},

	{"INTC1060"},

	{"INTC1061"},

	{""},

drivers/acpi/event.c

+4 −2
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 *

 */



#define pr_fmt(fmt) "ACPI: " fmt



#include <linux/spinlock.h>

#include <linux/export.h>

#include <linux/proc_fs.h>
@@ -173,8 +175,8 @@ static int __init acpi_event_init(void) 
	/* create genetlink for acpi event */

	error = acpi_event_genetlink_init();

	if (error)

		printk(KERN_WARNING PREFIX

		       "Failed to create genetlink family for ACPI event\n");

		pr_warn("Failed to create genetlink family for ACPI event\n");



	return 0;

}