Commit 2d4eb331 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-messages' 

* acpi-messages:
  ACPI: OSL: Clean up printing messages
  ACPI: OSL: Rework acpi_check_resource_conflict()
  ACPI: thermal: Clean up printing messages
  ACPI: video: Clean up printing messages
  ACPI: button: Clean up printing messages
  ACPI: battery: Clean up printing messages
  ACPI: AC: Clean up printing messages
  ACPI: bus: Drop ACPI_BUS_COMPONENT which is not used any more
  ACPI: utils: Clean up printing messages
  ACPI: scan: Clean up printing messages
  ACPI: bus: Clean up printing messages
  ACPI: PM: Clean up printing messages
  ACPI: power: Clean up printing messages
parents 6e60afb2 8aef273e

Documentation/firmware-guide/acpi/debug.rst

+6 −13
Original line number Diff line number Diff line
@@ -52,19 +52,12 @@ shows the supported mask values, currently these:: 
    ACPI_CA_DISASSEMBLER            0x00000800

    ACPI_COMPILER                   0x00001000

    ACPI_TOOLS                      0x00002000

    ACPI_BUS_COMPONENT              0x00010000

    ACPI_AC_COMPONENT               0x00020000

    ACPI_BATTERY_COMPONENT          0x00040000

    ACPI_BUTTON_COMPONENT           0x00080000

    ACPI_SBS_COMPONENT              0x00100000

    ACPI_FAN_COMPONENT              0x00200000

    ACPI_PCI_COMPONENT              0x00400000

    ACPI_POWER_COMPONENT            0x00800000

    ACPI_CONTAINER_COMPONENT        0x01000000

    ACPI_SYSTEM_COMPONENT           0x02000000

    ACPI_THERMAL_COMPONENT          0x04000000

    ACPI_MEMORY_DEVICE_COMPONENT    0x08000000

    ACPI_VIDEO_COMPONENT            0x10000000

    ACPI_PROCESSOR_COMPONENT        0x20000000



debug_level
@@ -118,15 +111,15 @@ currently these:: 
Examples

========



For example, drivers/acpi/bus.c contains this::

For example, drivers/acpi/acpica/evxfevnt.c contains this::



    #define _COMPONENT              ACPI_BUS_COMPONENT

    #define _COMPONENT          ACPI_EVENTS

    ...

    ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device insertion detected\n"));

    ACPI_DEBUG_PRINT((ACPI_DB_INIT, "ACPI mode disabled\n"));



To turn on this message, set the ACPI_BUS_COMPONENT bit in acpi.debug_layer

and the ACPI_LV_INFO bit in acpi.debug_level.  (The ACPI_DEBUG_PRINT

statement uses ACPI_DB_INFO, which is macro based on the ACPI_LV_INFO

To turn on this message, set the ACPI_EVENTS bit in acpi.debug_layer

and the ACPI_LV_INIT bit in acpi.debug_level.  (The ACPI_DEBUG_PRINT

statement uses ACPI_DB_INIT, which is a macro based on the ACPI_LV_INIT

definition.)



Enable all AML "Debug" output (stores to the Debug object while interpreting

drivers/acpi/ac.c

+10 −13
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
 *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>

 */



#define pr_fmt(fmt) "ACPI: AC: " fmt



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/slab.h>
@@ -18,8 +20,6 @@ 
#include <linux/acpi.h>

#include <acpi/battery.h>



#define PREFIX "ACPI: "



#define ACPI_AC_CLASS			"ac_adapter"

#define ACPI_AC_DEVICE_NAME		"AC Adapter"

#define ACPI_AC_FILE_STATE		"state"
@@ -28,9 +28,6 @@ 
#define ACPI_AC_STATUS_ONLINE		0x01

#define ACPI_AC_STATUS_UNKNOWN		0xFF



#define _COMPONENT		ACPI_AC_COMPONENT

ACPI_MODULE_NAME("ac");



MODULE_AUTHOR("Paul Diefenbaugh");

MODULE_DESCRIPTION("ACPI AC Adapter Driver");

MODULE_LICENSE("GPL");
@@ -102,8 +99,9 @@ static int acpi_ac_get_state(struct acpi_ac *ac) 
	status = acpi_evaluate_integer(ac->device->handle, "_PSR", NULL,

				       &ac->state);

	if (ACPI_FAILURE(status)) {

		ACPI_EXCEPTION((AE_INFO, status,

				"Error reading AC Adapter state"));

		acpi_handle_info(ac->device->handle,

				"Error reading AC Adapter state: %s\n",

				acpi_format_exception(status));

		ac->state = ACPI_AC_STATUS_UNKNOWN;

		return -ENODEV;

	}
@@ -153,8 +151,8 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event) 


	switch (event) {

	default:

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				  "Unsupported event [0x%x]\n", event));

		acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n",

				  event);

		fallthrough;

	case ACPI_AC_NOTIFY_STATUS:

	case ACPI_NOTIFY_BUS_CHECK:
@@ -278,9 +276,8 @@ static int acpi_ac_add(struct acpi_device *device) 
		goto end;

	}



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

	       acpi_device_name(device), acpi_device_bid(device),

	       ac->state ? "on-line" : "off-line");

	pr_info("%s [%s] (%s)\n", acpi_device_name(device),

		acpi_device_bid(device), ac->state ? "on-line" : "off-line");



	ac->battery_nb.notifier_call = acpi_ac_battery_notify;

	register_acpi_notifier(&ac->battery_nb);
@@ -348,7 +345,7 @@ static int __init acpi_ac_init(void) 
		for (i = 0; i < ARRAY_SIZE(acpi_ac_blacklist); i++)

			if (acpi_dev_present(acpi_ac_blacklist[i].hid, "1",

					     acpi_ac_blacklist[i].hrv)) {

				pr_info(PREFIX "AC: found native %s PMIC, not loading\n",

				pr_info("found native %s PMIC, not loading\n",

					acpi_ac_blacklist[i].hid);

				return -ENODEV;

			}

drivers/acpi/acpi_video.c

+51 −48
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 *  Copyright (C) 2006 Thomas Tuttle <linux-kernel@ttuttle.net>

 */



#define pr_fmt(fmt) "ACPI: video: " fmt



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>
@@ -26,16 +28,11 @@ 
#include <acpi/video.h>

#include <linux/uaccess.h>



#define PREFIX "ACPI: "



#define ACPI_VIDEO_BUS_NAME		"Video Bus"

#define ACPI_VIDEO_DEVICE_NAME		"Video Device"



#define MAX_NAME_LEN	20



#define _COMPONENT		ACPI_VIDEO_COMPONENT

ACPI_MODULE_NAME("video");



MODULE_AUTHOR("Bruno Ducrot");

MODULE_DESCRIPTION("ACPI Video Driver");

MODULE_LICENSE("GPL");
@@ -326,11 +323,11 @@ acpi_video_device_lcd_query_levels(acpi_handle handle, 
	*levels = NULL;



	status = acpi_evaluate_object(handle, "_BCL", NULL, &buffer);

	if (!ACPI_SUCCESS(status))

	if (ACPI_FAILURE(status))

		return status;

	obj = (union acpi_object *)buffer.pointer;

	if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) {

		printk(KERN_ERR PREFIX "Invalid _BCL data\n");

		acpi_handle_info(handle, "Invalid _BCL data\n");

		status = -EFAULT;

		goto err;

	}
@@ -354,7 +351,7 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level) 
	status = acpi_execute_simple_method(device->dev->handle,

					    "_BCM", level);

	if (ACPI_FAILURE(status)) {

		ACPI_ERROR((AE_INFO, "Evaluating _BCM failed"));

		acpi_handle_info(device->dev->handle, "_BCM evaluation failed\n");

		return -EIO;

	}
@@ -368,7 +365,7 @@ acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level) 
			return 0;

		}



	ACPI_ERROR((AE_INFO, "Current brightness invalid"));

	acpi_handle_info(device->dev->handle, "Current brightness invalid\n");

	return -EINVAL;

}
@@ -622,9 +619,8 @@ acpi_video_device_lcd_get_level_current(struct acpi_video_device *device, 
			 * BQC returned an invalid level.

			 * Stop using it.

			 */

			ACPI_WARNING((AE_INFO,

				      "%s returned an invalid level",

				      buf));

			acpi_handle_info(device->dev->handle,

					 "%s returned an invalid level", buf);

			device->cap._BQC = device->cap._BCQ = 0;

		} else {

			/*
@@ -635,7 +631,8 @@ acpi_video_device_lcd_get_level_current(struct acpi_video_device *device, 
			 * ACPI video backlight still works w/ buggy _BQC.

			 * http://bugzilla.kernel.org/show_bug.cgi?id=12233

			 */

			ACPI_WARNING((AE_INFO, "Evaluating %s failed", buf));

			acpi_handle_info(device->dev->handle,

					 "%s evaluation failed", buf);

			device->cap._BQC = device->cap._BCQ = 0;

		}

	}
@@ -675,7 +672,7 @@ acpi_video_device_EDID(struct acpi_video_device *device, 
	if (obj && obj->type == ACPI_TYPE_BUFFER)

		*edid = obj;

	else {

		printk(KERN_ERR PREFIX "Invalid _DDC data\n");

		acpi_handle_info(device->dev->handle, "Invalid _DDC data\n");

		status = -EFAULT;

		kfree(obj);

	}
@@ -827,10 +824,9 @@ int acpi_video_get_levels(struct acpi_device *device, 
	int result = 0;

	u32 value;



	if (!ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device->handle,

								&obj))) {

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query available "

						"LCD brightness level\n"));

	if (ACPI_FAILURE(acpi_video_device_lcd_query_levels(device->handle, &obj))) {

		acpi_handle_debug(device->handle,

				  "Could not query available LCD brightness level\n");

		result = -ENODEV;

		goto out;

	}
@@ -842,7 +838,6 @@ int acpi_video_get_levels(struct acpi_device *device, 


	br = kzalloc(sizeof(*br), GFP_KERNEL);

	if (!br) {

		printk(KERN_ERR "can't allocate memory\n");

		result = -ENOMEM;

		goto out;

	}
@@ -863,7 +858,7 @@ int acpi_video_get_levels(struct acpi_device *device, 
	for (i = 0; i < obj->package.count; i++) {

		o = (union acpi_object *)&obj->package.elements[i];

		if (o->type != ACPI_TYPE_INTEGER) {

			printk(KERN_ERR PREFIX "Invalid data\n");

			acpi_handle_info(device->handle, "Invalid data\n");

			continue;

		}

		value = (u32) o->integer.value;
@@ -900,7 +895,8 @@ int acpi_video_get_levels(struct acpi_device *device, 
			br->levels[i] = br->levels[i - level_ac_battery];

		count += level_ac_battery;

	} else if (level_ac_battery > ACPI_VIDEO_FIRST_LEVEL)

		ACPI_ERROR((AE_INFO, "Too many duplicates in _BCL package"));

		acpi_handle_info(device->handle,

				 "Too many duplicates in _BCL package");



	/* Check if the _BCL package is in a reversed order */

	if (max_level == br->levels[ACPI_VIDEO_FIRST_LEVEL]) {
@@ -910,8 +906,8 @@ int acpi_video_get_levels(struct acpi_device *device, 
		     sizeof(br->levels[ACPI_VIDEO_FIRST_LEVEL]),

		     acpi_video_cmp_level, NULL);

	} else if (max_level != br->levels[count - 1])

		ACPI_ERROR((AE_INFO,

			    "Found unordered _BCL package"));

		acpi_handle_info(device->handle,

				 "Found unordered _BCL package");



	br->count = count;

	*dev_br = br;
@@ -989,9 +985,9 @@ acpi_video_init_brightness(struct acpi_video_device *device) 
	if (result)

		goto out_free_levels;



	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

			  "found %d brightness levels\n",

			  br->count - ACPI_VIDEO_FIRST_LEVEL));

	acpi_handle_debug(device->dev->handle, "found %d brightness levels\n",

			  br->count - ACPI_VIDEO_FIRST_LEVEL);



	return 0;



out_free_levels:
@@ -1023,7 +1019,8 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) 
	if (acpi_has_method(device->dev->handle, "_BQC")) {

		device->cap._BQC = 1;

	} else if (acpi_has_method(device->dev->handle, "_BCQ")) {

		printk(KERN_WARNING FW_BUG "_BCQ is used instead of _BQC\n");

		acpi_handle_info(device->dev->handle,

				 "_BCQ is used instead of _BQC\n");

		device->cap._BCQ = 1;

	}
@@ -1083,8 +1080,7 @@ static int acpi_video_bus_check(struct acpi_video_bus *video) 
	/* Does this device support video switching? */

	if (video->cap._DOS || video->cap._DOD) {

		if (!video->cap._DOS) {

			printk(KERN_WARNING FW_BUG

				"ACPI(%s) defines _DOD but not _DOS\n",

			pr_info(FW_BUG "ACPI(%s) defines _DOD but not _DOS\n",

				acpi_device_bid(video->device));

		}

		video->flags.multihead = 1;
@@ -1272,7 +1268,8 @@ acpi_video_device_bind(struct acpi_video_bus *video, 
		ids = &video->attached_array[i];

		if (device->device_id == (ids->value.int_val & 0xffff)) {

			ids->bind_info = device;

			ACPI_DEBUG_PRINT((ACPI_DB_INFO, "device_bind %d\n", i));

			acpi_handle_debug(video->device->handle, "%s: %d\n",

					  __func__, i);

		}

	}

}
@@ -1324,20 +1321,22 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video) 
		return AE_NOT_EXIST;



	status = acpi_evaluate_object(video->device->handle, "_DOD", NULL, &buffer);

	if (!ACPI_SUCCESS(status)) {

		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _DOD"));

	if (ACPI_FAILURE(status)) {

		acpi_handle_info(video->device->handle,

				 "_DOD evaluation failed: %s\n",

				 acpi_format_exception(status));

		return status;

	}



	dod = buffer.pointer;

	if (!dod || (dod->type != ACPI_TYPE_PACKAGE)) {

		ACPI_EXCEPTION((AE_INFO, status, "Invalid _DOD data"));

		acpi_handle_info(video->device->handle, "Invalid _DOD data\n");

		status = -EFAULT;

		goto out;

	}



	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found %d video heads in _DOD\n",

			  dod->package.count));

	acpi_handle_debug(video->device->handle, "Found %d video heads in _DOD\n",

			  dod->package.count);



	active_list = kcalloc(1 + dod->package.count,

			      sizeof(struct acpi_video_enumerated_device),
@@ -1352,15 +1351,18 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video) 
		obj = &dod->package.elements[i];



		if (obj->type != ACPI_TYPE_INTEGER) {

			printk(KERN_ERR PREFIX

			acpi_handle_info(video->device->handle,

					 "Invalid _DOD data in element %d\n", i);

			continue;

		}



		active_list[count].value.int_val = obj->integer.value;

		active_list[count].bind_info = NULL;

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "dod element[%d] = %d\n", i,

				  (int)obj->integer.value));



		acpi_handle_debug(video->device->handle,

				  "_DOD element[%d] = %d\n", i,

				  (int)obj->integer.value);



		count++;

	}
@@ -1451,7 +1453,8 @@ acpi_video_switch_brightness(struct work_struct *work) 


out:

	if (result)

		printk(KERN_ERR PREFIX "Failed to switch the brightness\n");

		acpi_handle_info(device->dev->handle,

				 "Failed to switch brightness\n");

}



int acpi_video_get_edid(struct acpi_device *device, int type, int device_id,
@@ -1601,8 +1604,8 @@ static void acpi_video_bus_notify(struct acpi_device *device, u32 event) 
		break;



	default:

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				  "Unsupported event [0x%x]\n", event));

		acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n",

				  event);

		break;

	}
@@ -1675,8 +1678,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data) 
		keycode = KEY_DISPLAY_OFF;

		break;

	default:

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				  "Unsupported event [0x%x]\n", event));

		acpi_handle_debug(handle, "Unsupported event [0x%x]\n", event);

		break;

	}
@@ -1812,11 +1814,12 @@ static void acpi_video_dev_register_backlight(struct acpi_video_device *device) 
			&device->cooling_dev->device.kobj,

			"thermal_cooling");

	if (result)

		printk(KERN_ERR PREFIX "Create sysfs link\n");

		pr_info("sysfs link creation failed\n");



	result = sysfs_create_link(&device->cooling_dev->device.kobj,

			&device->dev->dev.kobj, "device");

	if (result)

		printk(KERN_ERR PREFIX "Create sysfs link\n");

		pr_info("Reverse sysfs link creation failed\n");

}



static void acpi_video_run_bcl_for_osi(struct acpi_video_bus *video)
@@ -2030,7 +2033,7 @@ static int acpi_video_bus_add(struct acpi_device *device) 
				acpi_video_bus_match, NULL,

				device, NULL);

	if (status == AE_ALREADY_EXISTS) {

		printk(KERN_WARNING FW_BUG

		pr_info(FW_BUG

			"Duplicate ACPI video bus devices for the"

			" same VGA controller, please try module "

			"parameter \"video.allow_duplicates=1\""
@@ -2073,7 +2076,7 @@ static int acpi_video_bus_add(struct acpi_device *device) 
	if (error)

		goto err_put_video;



	printk(KERN_INFO PREFIX "%s [%s] (multi-head: %s  rom: %s  post: %s)\n",

	pr_info("%s [%s] (multi-head: %s  rom: %s  post: %s)\n",

	       ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),

	       video->flags.multihead ? "yes" : "no",

	       video->flags.rom ? "yes" : "no",

drivers/acpi/battery.c

+16 −17
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define pr_fmt(fmt) "ACPI: battery: " fmt



#include <linux/async.h>

#include <linux/delay.h>
@@ -29,8 +29,6 @@ 


#include <acpi/battery.h>



#define PREFIX "ACPI: "



#define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF

#define ACPI_BATTERY_CAPACITY_VALID(capacity) \

	((capacity) != 0 && (capacity) != ACPI_BATTERY_VALUE_UNKNOWN)
@@ -44,10 +42,6 @@ 
#define ACPI_BATTERY_STATE_CHARGING	0x2

#define ACPI_BATTERY_STATE_CRITICAL	0x4



#define _COMPONENT		ACPI_BATTERY_COMPONENT



ACPI_MODULE_NAME("battery");



MODULE_AUTHOR("Paul Diefenbaugh");

MODULE_AUTHOR("Alexey Starikovskiy <astarikovskiy@suse.de>");

MODULE_DESCRIPTION("ACPI Battery Driver");
@@ -466,7 +460,8 @@ static int extract_package(struct acpi_battery *battery, 
static int acpi_battery_get_status(struct acpi_battery *battery)

{

	if (acpi_bus_get_status(battery->device)) {

		ACPI_EXCEPTION((AE_INFO, AE_ERROR, "Evaluating _STA"));

		acpi_handle_info(battery->device->handle,

				 "_STA evaluation failed\n");

		return -ENODEV;

	}

	return 0;
@@ -535,8 +530,10 @@ static int acpi_battery_get_info(struct acpi_battery *battery) 
		mutex_unlock(&battery->lock);



		if (ACPI_FAILURE(status)) {

			ACPI_EXCEPTION((AE_INFO, status, "Evaluating %s",

					use_bix ? "_BIX":"_BIF"));

			acpi_handle_info(battery->device->handle,

					 "%s evaluation failed: %s\n",

					 use_bix ?"_BIX":"_BIF",

				         acpi_format_exception(status));

		} else {

			result = extract_battery_info(use_bix,

						      battery,
@@ -573,7 +570,9 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 
	mutex_unlock(&battery->lock);



	if (ACPI_FAILURE(status)) {

		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST"));

		acpi_handle_info(battery->device->handle,

				 "_BST evaluation failed: %s",

				 acpi_format_exception(status));

		return -ENODEV;

	}
@@ -590,7 +589,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);

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

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

	}



	if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)
@@ -625,7 +624,9 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery) 
	if (ACPI_FAILURE(status))

		return -ENODEV;



	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Alarm set to %d\n", battery->alarm));

	acpi_handle_debug(battery->device->handle, "Alarm set to %d\n",

			  battery->alarm);



	return 0;

}
@@ -1201,8 +1202,7 @@ static int acpi_battery_add(struct acpi_device *device) 
	if (result)

		goto fail;



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

		ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),

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

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



	battery->pm_nb.notifier_call = battery_notify;
@@ -1282,8 +1282,7 @@ static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie) 
	if (battery_check_pmic) {

		for (i = 0; i < ARRAY_SIZE(acpi_battery_blacklist); i++)

			if (acpi_dev_present(acpi_battery_blacklist[i], "1", -1)) {

				pr_info(PREFIX ACPI_BATTERY_DEVICE_NAME

					": found native %s PMIC, not loading\n",

				pr_info("found native %s PMIC, not loading\n",

					acpi_battery_blacklist[i]);

				return;

			}

drivers/acpi/bus.c

+26 −34
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
 *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>

 */



#define pr_fmt(fmt) "ACPI: " fmt



#include <linux/module.h>

#include <linux/init.h>

#include <linux/ioport.h>
@@ -31,9 +33,6 @@ 


#include "internal.h"



#define _COMPONENT		ACPI_BUS_COMPONENT

ACPI_MODULE_NAME("bus");



struct acpi_device *acpi_root;

struct proc_dir_entry *acpi_root_dir;

EXPORT_SYMBOL(acpi_root_dir);
@@ -47,8 +46,7 @@ static inline int set_copy_dsdt(const struct dmi_system_id *id) 
#else

static int set_copy_dsdt(const struct dmi_system_id *id)

{

	printk(KERN_NOTICE "%s detected - "

		"force copy of DSDT to local memory\n", id->ident);

	pr_notice("%s detected - force copy of DSDT to local memory\n", id->ident);

	acpi_gbl_copy_dsdt_locally = 1;

	return 0;

}
@@ -116,13 +114,11 @@ int acpi_bus_get_status(struct acpi_device *device) 
	acpi_set_device_status(device, sta);



	if (device->status.functional && !device->status.present) {

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] status [%08x]: "

		       "functional but not present;\n",

			device->pnp.bus_id, (u32)sta));

		pr_debug("Device [%s] status [%08x]: functional but not present\n",

			 device->pnp.bus_id, (u32)sta);

	}



	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] status [%08x]\n",

			  device->pnp.bus_id, (u32)sta));

	pr_debug("Device [%s] status [%08x]\n", device->pnp.bus_id, (u32)sta);

	return 0;

}

EXPORT_SYMBOL(acpi_bus_get_status);
@@ -915,9 +911,9 @@ static int acpi_device_probe(struct device *dev) 
		return ret;



	acpi_dev->driver = acpi_drv;

	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

			  "Driver [%s] successfully bound to device [%s]\n",

			  acpi_drv->name, acpi_dev->pnp.bus_id));



	pr_debug("Driver [%s] successfully bound to device [%s]\n",

		 acpi_drv->name, acpi_dev->pnp.bus_id);



	if (acpi_drv->ops.notify) {

		ret = acpi_device_install_notify_handler(acpi_dev);
@@ -931,8 +927,9 @@ static int acpi_device_probe(struct device *dev) 
		}

	}



	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found driver [%s] for device [%s]\n",

			  acpi_drv->name, acpi_dev->pnp.bus_id));

	pr_debug("Found driver [%s] for device [%s]\n", acpi_drv->name,

		 acpi_dev->pnp.bus_id);



	get_device(dev);

	return 0;

}
@@ -995,15 +992,15 @@ static int __init acpi_bus_init_irq(void) 
		message = "platform specific model";

		break;

	default:

		printk(KERN_WARNING PREFIX "Unknown interrupt routing model\n");

		pr_info("Unknown interrupt routing model\n");

		return -ENODEV;

	}



	printk(KERN_INFO PREFIX "Using %s for interrupt routing\n", message);

	pr_info("Using %s for interrupt routing\n", message);



	status = acpi_execute_simple_method(NULL, "\\_PIC", acpi_irq_model);

	if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {

		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PIC"));

		pr_info("_PIC evaluation failed: %s\n", acpi_format_exception(status));

		return -ENODEV;

	}
@@ -1027,7 +1024,7 @@ void __init acpi_early_init(void) 
	if (acpi_disabled)

		return;



	printk(KERN_INFO PREFIX "Core revision %08x\n", ACPI_CA_VERSION);

	pr_info("Core revision %08x\n", ACPI_CA_VERSION);



	/* enable workarounds, unless strict ACPI spec. compliance */

	if (!acpi_strict)
@@ -1048,15 +1045,13 @@ void __init acpi_early_init(void) 


	status = acpi_reallocate_root_table();

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX

		       "Unable to reallocate ACPI tables\n");

		pr_err("Unable to reallocate ACPI tables\n");

		goto error0;

	}



	status = acpi_initialize_subsystem();

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX

		       "Unable to initialize the ACPI Interpreter\n");

		pr_err("Unable to initialize the ACPI Interpreter\n");

		goto error0;

	}
@@ -1102,7 +1097,7 @@ void __init acpi_subsystem_init(void) 


	status = acpi_enable_subsystem(~ACPI_NO_ACPI_ENABLE);

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX "Unable to enable ACPI\n");

		pr_err("Unable to enable ACPI\n");

		disable_acpi();

	} else {

		/*
@@ -1131,8 +1126,7 @@ static int __init acpi_bus_init(void) 


	status = acpi_load_tables();

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX

		       "Unable to load the System Description Tables\n");

		pr_err("Unable to load the System Description Tables\n");

		goto error1;

	}
@@ -1150,14 +1144,13 @@ static int __init acpi_bus_init(void) 


	status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE);

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX

		       "Unable to start the ACPI Interpreter\n");

		pr_err("Unable to start the ACPI Interpreter\n");

		goto error1;

	}



	status = acpi_initialize_objects(ACPI_FULL_INITIALIZATION);

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX "Unable to initialize ACPI objects\n");

		pr_err("Unable to initialize ACPI objects\n");

		goto error1;

	}
@@ -1186,7 +1179,7 @@ static int __init acpi_bus_init(void) 
	 */

	acpi_ec_dsdt_probe();



	printk(KERN_INFO PREFIX "Interpreter enabled\n");

	pr_info("Interpreter enabled\n");



	/* Initialize sleep structures */

	acpi_sleep_init();
@@ -1205,8 +1198,7 @@ static int __init acpi_bus_init(void) 
	    acpi_install_notify_handler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY,

					&acpi_bus_notify, NULL);

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX

		       "Unable to register for device notifications\n");

		pr_err("Unable to register for system notifications\n");

		goto error1;

	}
@@ -1233,13 +1225,13 @@ static int __init acpi_init(void) 
	int result;



	if (acpi_disabled) {

		printk(KERN_INFO PREFIX "Interpreter disabled.\n");

		pr_info("Interpreter disabled.\n");

		return -ENODEV;

	}



	acpi_kobj = kobject_create_and_add("acpi", firmware_kobj);

	if (!acpi_kobj) {

		printk(KERN_WARNING "%s: kset create error\n", __func__);

		pr_debug("%s: kset create error\n", __func__);

		acpi_kobj = NULL;

	}