aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-07-28 16:45:54 -0400
committerLen Brown <len.brown@intel.com>2009-08-28 19:57:27 -0400
commita192a9580bcc41692be1f36b77c3b681827f566a (patch)
tree8cf1637f87faa880fdffab62a701b47f699945f9
parent2a4ab640d3c28c2952967e5f63ea495555bf2a5f (diff)
ACPI: Move definition of PREFIX from acpi_bus.h to internal..h
Linux/ACPI core files using internal.h all PREFIX "ACPI: ", however, not all ACPI drivers use/want it -- and they should not have to #undef PREFIX to define their own. Add GPL commment to internal.h while we are there. This does not change any actual console output, asside from a whitespace fix. Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--arch/x86/pci/mmconfig-shared.c2
-rw-r--r--drivers/acpi/ac.c2
-rw-r--r--drivers/acpi/battery.c2
-rw-r--r--drivers/acpi/blacklist.c2
-rw-r--r--drivers/acpi/button.c2
-rw-r--r--drivers/acpi/cm_sbs.c2
-rw-r--r--drivers/acpi/container.c2
-rw-r--r--drivers/acpi/dock.c2
-rw-r--r--drivers/acpi/ec.c1
-rw-r--r--drivers/acpi/event.c2
-rw-r--r--drivers/acpi/fan.c2
-rw-r--r--drivers/acpi/glue.c2
-rw-r--r--drivers/acpi/internal.h22
-rw-r--r--drivers/acpi/numa.c2
-rw-r--r--drivers/acpi/pci_irq.c2
-rw-r--r--drivers/acpi/pci_link.c2
-rw-r--r--drivers/acpi/pci_root.c2
-rw-r--r--drivers/acpi/power.c2
-rw-r--r--drivers/acpi/processor_core.c2
-rw-r--r--drivers/acpi/processor_idle.c2
-rw-r--r--drivers/acpi/processor_perflib.c2
-rw-r--r--drivers/acpi/processor_thermal.c2
-rw-r--r--drivers/acpi/processor_throttling.c2
-rw-r--r--drivers/acpi/sbs.c2
-rw-r--r--drivers/acpi/sbshc.c2
-rw-r--r--drivers/acpi/system.c2
-rw-r--r--drivers/acpi/thermal.c2
-rw-r--r--drivers/acpi/utils.c2
-rw-r--r--drivers/acpi/video.c2
-rw-r--r--drivers/acpi/video_detect.c2
-rw-r--r--drivers/pci/dmar.c3
-rw-r--r--drivers/platform/x86/fujitsu-laptop.c4
-rw-r--r--drivers/platform/x86/wmi.c1
-rw-r--r--include/acpi/acpi_bus.h2
34 files changed, 80 insertions, 9 deletions
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 712443ec6d43..81d3466765ca 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -18,6 +18,8 @@
18#include <asm/e820.h> 18#include <asm/e820.h>
19#include <asm/pci_x86.h> 19#include <asm/pci_x86.h>
20 20
21#define PREFIX "ACPI: "
22
21/* aperture is up to 256MB but BIOS may reserve less */ 23/* aperture is up to 256MB but BIOS may reserve less */
22#define MMCONFIG_APER_MIN (2 * 1024*1024) 24#define MMCONFIG_APER_MIN (2 * 1024*1024)
23#define MMCONFIG_APER_MAX (256 * 1024*1024) 25#define MMCONFIG_APER_MAX (256 * 1024*1024)
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 0df8fcb687d6..98b9690b0159 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -37,6 +37,8 @@
37#include <acpi/acpi_bus.h> 37#include <acpi/acpi_bus.h>
38#include <acpi/acpi_drivers.h> 38#include <acpi/acpi_drivers.h>
39 39
40#define PREFIX "ACPI: "
41
40#define ACPI_AC_CLASS "ac_adapter" 42#define ACPI_AC_CLASS "ac_adapter"
41#define ACPI_AC_DEVICE_NAME "AC Adapter" 43#define ACPI_AC_DEVICE_NAME "AC Adapter"
42#define ACPI_AC_FILE_STATE "state" 44#define ACPI_AC_FILE_STATE "state"
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 58b4517ce712..f8c3d1bb6969 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -45,6 +45,8 @@
45#include <linux/power_supply.h> 45#include <linux/power_supply.h>
46#endif 46#endif
47 47
48#define PREFIX "ACPI: "
49
48#define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF 50#define ACPI_BATTERY_VALUE_UNKNOWN 0xFFFFFFFF
49 51
50#define ACPI_BATTERY_CLASS "battery" 52#define ACPI_BATTERY_CLASS "battery"
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index f6baa77deefb..19152ea2b104 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -34,6 +34,8 @@
34#include <acpi/acpi_bus.h> 34#include <acpi/acpi_bus.h>
35#include <linux/dmi.h> 35#include <linux/dmi.h>
36 36
37#include "internal.h"
38
37enum acpi_blacklist_predicates { 39enum acpi_blacklist_predicates {
38 all_versions, 40 all_versions,
39 less_than_or_equal, 41 less_than_or_equal,
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 9195deba9d94..d295bdccc09c 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -33,6 +33,8 @@
33#include <acpi/acpi_bus.h> 33#include <acpi/acpi_bus.h>
34#include <acpi/acpi_drivers.h> 34#include <acpi/acpi_drivers.h>
35 35
36#define PREFIX "ACPI: "
37
36#define ACPI_BUTTON_CLASS "button" 38#define ACPI_BUTTON_CLASS "button"
37#define ACPI_BUTTON_FILE_INFO "info" 39#define ACPI_BUTTON_FILE_INFO "info"
38#define ACPI_BUTTON_FILE_STATE "state" 40#define ACPI_BUTTON_FILE_STATE "state"
diff --git a/drivers/acpi/cm_sbs.c b/drivers/acpi/cm_sbs.c
index 332fe4b21708..6c9ee68e46fb 100644
--- a/drivers/acpi/cm_sbs.c
+++ b/drivers/acpi/cm_sbs.c
@@ -28,6 +28,8 @@
28#include <acpi/acpi_bus.h> 28#include <acpi/acpi_bus.h>
29#include <acpi/acpi_drivers.h> 29#include <acpi/acpi_drivers.h>
30 30
31#define PREFIX "ACPI: "
32
31ACPI_MODULE_NAME("cm_sbs"); 33ACPI_MODULE_NAME("cm_sbs");
32#define ACPI_AC_CLASS "ac_adapter" 34#define ACPI_AC_CLASS "ac_adapter"
33#define ACPI_BATTERY_CLASS "battery" 35#define ACPI_BATTERY_CLASS "battery"
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index fe0cdf83641a..5f2c3c00a315 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -35,6 +35,8 @@
35#include <acpi/acpi_drivers.h> 35#include <acpi/acpi_drivers.h>
36#include <acpi/container.h> 36#include <acpi/container.h>
37 37
38#define PREFIX "ACPI: "
39
38#define ACPI_CONTAINER_DEVICE_NAME "ACPI container device" 40#define ACPI_CONTAINER_DEVICE_NAME "ACPI container device"
39#define ACPI_CONTAINER_CLASS "container" 41#define ACPI_CONTAINER_CLASS "container"
40 42
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index efb959d6c8a9..9a855669ff12 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -33,6 +33,8 @@
33#include <acpi/acpi_bus.h> 33#include <acpi/acpi_bus.h>
34#include <acpi/acpi_drivers.h> 34#include <acpi/acpi_drivers.h>
35 35
36#define PREFIX "ACPI: "
37
36#define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver" 38#define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver"
37 39
38ACPI_MODULE_NAME("dock"); 40ACPI_MODULE_NAME("dock");
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 391f331674c7..5180f0f1dd02 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -47,7 +47,6 @@
47#define ACPI_EC_DEVICE_NAME "Embedded Controller" 47#define ACPI_EC_DEVICE_NAME "Embedded Controller"
48#define ACPI_EC_FILE_INFO "info" 48#define ACPI_EC_FILE_INFO "info"
49 49
50#undef PREFIX
51#define PREFIX "ACPI: EC: " 50#define PREFIX "ACPI: EC: "
52 51
53/* EC status register */ 52/* EC status register */
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index aeb7e5fb4a04..c511071bfd79 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -14,6 +14,8 @@
14#include <net/netlink.h> 14#include <net/netlink.h>
15#include <net/genetlink.h> 15#include <net/genetlink.h>
16 16
17#include "internal.h"
18
17#define _COMPONENT ACPI_SYSTEM_COMPONENT 19#define _COMPONENT ACPI_SYSTEM_COMPONENT
18ACPI_MODULE_NAME("event"); 20ACPI_MODULE_NAME("event");
19 21
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 53698ea08371..f419849a0d3f 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -34,6 +34,8 @@
34#include <acpi/acpi_bus.h> 34#include <acpi/acpi_bus.h>
35#include <acpi/acpi_drivers.h> 35#include <acpi/acpi_drivers.h>
36 36
37#define PREFIX "ACPI: "
38
37#define ACPI_FAN_CLASS "fan" 39#define ACPI_FAN_CLASS "fan"
38#define ACPI_FAN_FILE_STATE "state" 40#define ACPI_FAN_FILE_STATE "state"
39 41
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index a8a5c29958c8..dc36a448de43 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -12,6 +12,8 @@
12#include <linux/rwsem.h> 12#include <linux/rwsem.h>
13#include <linux/acpi.h> 13#include <linux/acpi.h>
14 14
15#include "internal.h"
16
15#define ACPI_GLUE_DEBUG 0 17#define ACPI_GLUE_DEBUG 0
16#if ACPI_GLUE_DEBUG 18#if ACPI_GLUE_DEBUG
17#define DBG(x...) printk(PREFIX x) 19#define DBG(x...) printk(PREFIX x)
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 11a69b53004e..074cf8682d52 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -1,4 +1,24 @@
1/* For use by Linux/ACPI infrastructure, not drivers */ 1/*
2 * acpi/internal.h
3 * For use by Linux/ACPI infrastructure, not drivers
4 *
5 * Copyright (c) 2009, Intel Corporation.
6 *
7 * This program is free software; you can redistribute it and/or modify it
8 * under the terms and conditions of the GNU General Public License,
9 * version 2, as published by the Free Software Foundation.
10 *
11 * This program is distributed in the hope it will be useful, but WITHOUT
12 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
14 * more details.
15 *
16 * You should have received a copy of the GNU General Public License along with
17 * this program; if not, write to the Free Software Foundation, Inc.,
18 * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
19 */
20
21#define PREFIX "ACPI: "
2 22
3int init_acpi_device_notify(void); 23int init_acpi_device_notify(void);
4int acpi_scan_init(void); 24int acpi_scan_init(void);
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index d440ccd27d91..202dd0c976a3 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -30,6 +30,8 @@
30#include <linux/acpi.h> 30#include <linux/acpi.h>
31#include <acpi/acpi_bus.h> 31#include <acpi/acpi_bus.h>
32 32
33#define PREFIX "ACPI: "
34
33#define ACPI_NUMA 0x80000000 35#define ACPI_NUMA 0x80000000
34#define _COMPONENT ACPI_NUMA 36#define _COMPONENT ACPI_NUMA
35ACPI_MODULE_NAME("numa"); 37ACPI_MODULE_NAME("numa");
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index b794eb88ab90..843699ed93f2 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -40,6 +40,8 @@
40#include <acpi/acpi_bus.h> 40#include <acpi/acpi_bus.h>
41#include <acpi/acpi_drivers.h> 41#include <acpi/acpi_drivers.h>
42 42
43#define PREFIX "ACPI: "
44
43#define _COMPONENT ACPI_PCI_COMPONENT 45#define _COMPONENT ACPI_PCI_COMPONENT
44ACPI_MODULE_NAME("pci_irq"); 46ACPI_MODULE_NAME("pci_irq");
45 47
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 16e0f9d3d17c..394ae89409c2 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -43,6 +43,8 @@
43#include <acpi/acpi_bus.h> 43#include <acpi/acpi_bus.h>
44#include <acpi/acpi_drivers.h> 44#include <acpi/acpi_drivers.h>
45 45
46#define PREFIX "ACPI: "
47
46#define _COMPONENT ACPI_PCI_COMPONENT 48#define _COMPONENT ACPI_PCI_COMPONENT
47ACPI_MODULE_NAME("pci_link"); 49ACPI_MODULE_NAME("pci_link");
48#define ACPI_PCI_LINK_CLASS "pci_irq_routing" 50#define ACPI_PCI_LINK_CLASS "pci_irq_routing"
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 55b5b90c2a44..dee916707a7d 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -36,6 +36,8 @@
36#include <acpi/acpi_bus.h> 36#include <acpi/acpi_bus.h>
37#include <acpi/acpi_drivers.h> 37#include <acpi/acpi_drivers.h>
38 38
39#define PREFIX "ACPI: "
40
39#define _COMPONENT ACPI_PCI_COMPONENT 41#define _COMPONENT ACPI_PCI_COMPONENT
40ACPI_MODULE_NAME("pci_root"); 42ACPI_MODULE_NAME("pci_root");
41#define ACPI_PCI_ROOT_CLASS "pci_bridge" 43#define ACPI_PCI_ROOT_CLASS "pci_bridge"
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index d74365d4a6e7..e86603f37dee 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -44,6 +44,8 @@
44#include <acpi/acpi_bus.h> 44#include <acpi/acpi_bus.h>
45#include <acpi/acpi_drivers.h> 45#include <acpi/acpi_drivers.h>
46 46
47#define PREFIX "ACPI: "
48
47#define _COMPONENT ACPI_POWER_COMPONENT 49#define _COMPONENT ACPI_POWER_COMPONENT
48ACPI_MODULE_NAME("power"); 50ACPI_MODULE_NAME("power");
49#define ACPI_POWER_CLASS "power_resource" 51#define ACPI_POWER_CLASS "power_resource"
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 2cc4b3033872..b4a1ab297e7b 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -59,6 +59,8 @@
59#include <acpi/acpi_drivers.h> 59#include <acpi/acpi_drivers.h>
60#include <acpi/processor.h> 60#include <acpi/processor.h>
61 61
62#define PREFIX "ACPI: "
63
62#define ACPI_PROCESSOR_CLASS "processor" 64#define ACPI_PROCESSOR_CLASS "processor"
63#define ACPI_PROCESSOR_DEVICE_NAME "Processor" 65#define ACPI_PROCESSOR_DEVICE_NAME "Processor"
64#define ACPI_PROCESSOR_FILE_INFO "info" 66#define ACPI_PROCESSOR_FILE_INFO "info"
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 66393d5c4c7c..22aab1fc9b45 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -60,6 +60,8 @@
60#include <acpi/processor.h> 60#include <acpi/processor.h>
61#include <asm/processor.h> 61#include <asm/processor.h>
62 62
63#define PREFIX "ACPI: "
64
63#define ACPI_PROCESSOR_CLASS "processor" 65#define ACPI_PROCESSOR_CLASS "processor"
64#define _COMPONENT ACPI_PROCESSOR_COMPONENT 66#define _COMPONENT ACPI_PROCESSOR_COMPONENT
65ACPI_MODULE_NAME("processor_idle"); 67ACPI_MODULE_NAME("processor_idle");
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 60e543d3234e..11088cf10319 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -39,6 +39,8 @@
39#include <acpi/acpi_drivers.h> 39#include <acpi/acpi_drivers.h>
40#include <acpi/processor.h> 40#include <acpi/processor.h>
41 41
42#define PREFIX "ACPI: "
43
42#define ACPI_PROCESSOR_CLASS "processor" 44#define ACPI_PROCESSOR_CLASS "processor"
43#define ACPI_PROCESSOR_FILE_PERFORMANCE "performance" 45#define ACPI_PROCESSOR_FILE_PERFORMANCE "performance"
44#define _COMPONENT ACPI_PROCESSOR_COMPONENT 46#define _COMPONENT ACPI_PROCESSOR_COMPONENT
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index 31adda1099e0..3e3181c0efc3 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -40,6 +40,8 @@
40#include <acpi/processor.h> 40#include <acpi/processor.h>
41#include <acpi/acpi_drivers.h> 41#include <acpi/acpi_drivers.h>
42 42
43#define PREFIX "ACPI: "
44
43#define ACPI_PROCESSOR_CLASS "processor" 45#define ACPI_PROCESSOR_CLASS "processor"
44#define _COMPONENT ACPI_PROCESSOR_COMPONENT 46#define _COMPONENT ACPI_PROCESSOR_COMPONENT
45ACPI_MODULE_NAME("processor_thermal"); 47ACPI_MODULE_NAME("processor_thermal");
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index ae39797aab55..b366b9c13d4d 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -41,6 +41,8 @@
41#include <acpi/acpi_drivers.h> 41#include <acpi/acpi_drivers.h>
42#include <acpi/processor.h> 42#include <acpi/processor.h>
43 43
44#define PREFIX "ACPI: "
45
44#define ACPI_PROCESSOR_CLASS "processor" 46#define ACPI_PROCESSOR_CLASS "processor"
45#define _COMPONENT ACPI_PROCESSOR_COMPONENT 47#define _COMPONENT ACPI_PROCESSOR_COMPONENT
46ACPI_MODULE_NAME("processor_throttling"); 48ACPI_MODULE_NAME("processor_throttling");
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 4b214b74ebaa..52b9db8afc20 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -46,6 +46,8 @@
46 46
47#include "sbshc.h" 47#include "sbshc.h"
48 48
49#define PREFIX "ACPI: "
50
49#define ACPI_SBS_CLASS "sbs" 51#define ACPI_SBS_CLASS "sbs"
50#define ACPI_AC_CLASS "ac_adapter" 52#define ACPI_AC_CLASS "ac_adapter"
51#define ACPI_BATTERY_CLASS "battery" 53#define ACPI_BATTERY_CLASS "battery"
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index 0619734895b2..d9339806df45 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -15,6 +15,8 @@
15#include <linux/interrupt.h> 15#include <linux/interrupt.h>
16#include "sbshc.h" 16#include "sbshc.h"
17 17
18#define PREFIX "ACPI: "
19
18#define ACPI_SMB_HC_CLASS "smbus_host_controller" 20#define ACPI_SMB_HC_CLASS "smbus_host_controller"
19#define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" 21#define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC"
20 22
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index 9c61ab2177cf..d11282975f35 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -31,6 +31,8 @@
31 31
32#include <acpi/acpi_drivers.h> 32#include <acpi/acpi_drivers.h>
33 33
34#define PREFIX "ACPI: "
35
34#define _COMPONENT ACPI_SYSTEM_COMPONENT 36#define _COMPONENT ACPI_SYSTEM_COMPONENT
35ACPI_MODULE_NAME("system"); 37ACPI_MODULE_NAME("system");
36 38
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 564ea1424288..65f67815902a 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -47,6 +47,8 @@
47#include <acpi/acpi_bus.h> 47#include <acpi/acpi_bus.h>
48#include <acpi/acpi_drivers.h> 48#include <acpi/acpi_drivers.h>
49 49
50#define PREFIX "ACPI: "
51
50#define ACPI_THERMAL_CLASS "thermal_zone" 52#define ACPI_THERMAL_CLASS "thermal_zone"
51#define ACPI_THERMAL_DEVICE_NAME "Thermal Zone" 53#define ACPI_THERMAL_DEVICE_NAME "Thermal Zone"
52#define ACPI_THERMAL_FILE_STATE "state" 54#define ACPI_THERMAL_FILE_STATE "state"
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index f844941089bb..811fec10462b 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -30,6 +30,8 @@
30#include <acpi/acpi_bus.h> 30#include <acpi/acpi_bus.h>
31#include <acpi/acpi_drivers.h> 31#include <acpi/acpi_drivers.h>
32 32
33#include "internal.h"
34
33#define _COMPONENT ACPI_BUS_COMPONENT 35#define _COMPONENT ACPI_BUS_COMPONENT
34ACPI_MODULE_NAME("utils"); 36ACPI_MODULE_NAME("utils");
35 37
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 8851315ce858..a0fa3946b507 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -44,6 +44,8 @@
44#include <acpi/acpi_bus.h> 44#include <acpi/acpi_bus.h>
45#include <acpi/acpi_drivers.h> 45#include <acpi/acpi_drivers.h>
46 46
47#define PREFIX "ACPI: "
48
47#define ACPI_VIDEO_CLASS "video" 49#define ACPI_VIDEO_CLASS "video"
48#define ACPI_VIDEO_BUS_NAME "Video Bus" 50#define ACPI_VIDEO_BUS_NAME "Video Bus"
49#define ACPI_VIDEO_DEVICE_NAME "Video Device" 51#define ACPI_VIDEO_DEVICE_NAME "Video Device"
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 7cd2b63435ea..7032f25da9b5 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -38,6 +38,8 @@
38#include <linux/dmi.h> 38#include <linux/dmi.h>
39#include <linux/pci.h> 39#include <linux/pci.h>
40 40
41#define PREFIX "ACPI: "
42
41ACPI_MODULE_NAME("video"); 43ACPI_MODULE_NAME("video");
42#define _COMPONENT ACPI_VIDEO_COMPONENT 44#define _COMPONENT ACPI_VIDEO_COMPONENT
43 45
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 7b287cb38b7a..998f02d2ba42 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -34,8 +34,7 @@
34#include <linux/irq.h> 34#include <linux/irq.h>
35#include <linux/interrupt.h> 35#include <linux/interrupt.h>
36 36
37#undef PREFIX 37#define PREFIX "DMAR: "
38#define PREFIX "DMAR:"
39 38
40/* No locks are needed as DMA remapping hardware unit 39/* No locks are needed as DMA remapping hardware unit
41 * list is constructed at boot time and hotplug of 40 * list is constructed at boot time and hotplug of
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 218b9a16ac3f..eabddc9c192b 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -700,7 +700,7 @@ static int acpi_fujitsu_add(struct acpi_device *device)
700 goto end; 700 goto end;
701 } 701 }
702 702
703 printk(KERN_INFO PREFIX "%s [%s] (%s)\n", 703 printk(KERN_INFO "ACPI: %s [%s] (%s)\n",
704 acpi_device_name(device), acpi_device_bid(device), 704 acpi_device_name(device), acpi_device_bid(device),
705 !device->power.state ? "on" : "off"); 705 !device->power.state ? "on" : "off");
706 706
@@ -874,7 +874,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
874 goto end; 874 goto end;
875 } 875 }
876 876
877 printk(KERN_INFO PREFIX "%s [%s] (%s)\n", 877 printk(KERN_INFO "ACPI: %s [%s] (%s)\n",
878 acpi_device_name(device), acpi_device_bid(device), 878 acpi_device_name(device), acpi_device_bid(device),
879 !device->power.state ? "on" : "off"); 879 !device->power.state ? "on" : "off");
880 880
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index f215a5919192..177f8d767df4 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -42,7 +42,6 @@ MODULE_LICENSE("GPL");
42 42
43#define ACPI_WMI_CLASS "wmi" 43#define ACPI_WMI_CLASS "wmi"
44 44
45#undef PREFIX
46#define PREFIX "ACPI: WMI: " 45#define PREFIX "ACPI: WMI: "
47 46
48static DEFINE_MUTEX(wmi_data_lock); 47static DEFINE_MUTEX(wmi_data_lock);
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index c65e4ce6c3af..f485107ddc43 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -30,8 +30,6 @@
30 30
31#include <acpi/acpi.h> 31#include <acpi/acpi.h>
32 32
33#define PREFIX "ACPI: "
34
35/* TBD: Make dynamic */ 33/* TBD: Make dynamic */
36#define ACPI_MAX_HANDLES 10 34#define ACPI_MAX_HANDLES 10
37struct acpi_handle_list { 35struct acpi_handle_list {