tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ACPI: Remove duplicate definitions of PREFIX

We already have a macro for PREFIX of "ACPI: " in
drivers/acpi/internal.h, so remove the duplicate ones
in ACPI drivers when internal.h is included.

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Hanjun Guo and committed by
Rafael J. Wysocki 07070e12 730bf5eb

+1 -22
-2
drivers/acpi/acpi_cmos_rtc.c
··· 18 18 19 19 #include "internal.h" 20 20 21 - #define PREFIX "ACPI: " 22 - 23 21 ACPI_MODULE_NAME("cmos rtc"); 24 22 25 23 static const struct acpi_device_id acpi_cmos_rtc_ids[] = {
-2
drivers/acpi/container.c
··· 31 31 32 32 #include "internal.h" 33 33 34 - #define PREFIX "ACPI: " 35 - 36 34 #define _COMPONENT ACPI_CONTAINER_COMPONENT 37 35 ACPI_MODULE_NAME("container"); 38 36
-2
drivers/acpi/dock.c
··· 35 35 36 36 #include "internal.h" 37 37 38 - #define PREFIX "ACPI: " 39 - 40 38 #define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver" 41 39 42 40 ACPI_MODULE_NAME("dock");
+1 -1
drivers/acpi/osl.c
··· 52 52 53 53 #define _COMPONENT ACPI_OS_SERVICES 54 54 ACPI_MODULE_NAME("osl"); 55 - #define PREFIX "ACPI: " 55 + 56 56 struct acpi_os_dpc { 57 57 acpi_osd_exec_callback function; 58 58 void *context;
-2
drivers/acpi/pci_link.c
··· 43 43 44 44 #include "internal.h" 45 45 46 - #define PREFIX "ACPI: " 47 - 48 46 #define _COMPONENT ACPI_PCI_COMPONENT 49 47 ACPI_MODULE_NAME("pci_link"); 50 48 #define ACPI_PCI_LINK_CLASS "pci_irq_routing"
-2
drivers/acpi/pci_root.c
··· 39 39 40 40 #include "internal.h" 41 41 42 - #define PREFIX "ACPI: " 43 - 44 42 #define _COMPONENT ACPI_PCI_COMPONENT 45 43 ACPI_MODULE_NAME("pci_root"); 46 44 #define ACPI_PCI_ROOT_CLASS "pci_bridge"
-2
drivers/acpi/power.c
··· 46 46 #include "sleep.h" 47 47 #include "internal.h" 48 48 49 - #define PREFIX "ACPI: " 50 - 51 49 #define _COMPONENT ACPI_POWER_COMPONENT 52 50 ACPI_MODULE_NAME("power"); 53 51 #define ACPI_POWER_CLASS "power_resource"
-1
drivers/acpi/processor_core.c
··· 15 15 16 16 #include "internal.h" 17 17 18 - #define PREFIX "ACPI: " 19 18 #define _COMPONENT ACPI_PROCESSOR_COMPONENT 20 19 ACPI_MODULE_NAME("processor_core"); 21 20
-2
drivers/acpi/processor_driver.c
··· 41 41 42 42 #include "internal.h" 43 43 44 - #define PREFIX "ACPI: " 45 - 46 44 #define ACPI_PROCESSOR_NOTIFY_PERFORMANCE 0x80 47 45 #define ACPI_PROCESSOR_NOTIFY_POWER 0x81 48 46 #define ACPI_PROCESSOR_NOTIFY_THROTTLING 0x82
-2
drivers/acpi/sysfs.c
··· 12 12 #define _COMPONENT ACPI_SYSTEM_COMPONENT 13 13 ACPI_MODULE_NAME("sysfs"); 14 14 15 - #define PREFIX "ACPI: " 16 - 17 15 #ifdef CONFIG_ACPI_DEBUG 18 16 /* 19 17 * ACPI debug sysfs I/F, including:
-2
drivers/acpi/video.c
··· 45 45 46 46 #include "internal.h" 47 47 48 - #define PREFIX "ACPI: " 49 - 50 48 #define ACPI_VIDEO_BUS_NAME "Video Bus" 51 49 #define ACPI_VIDEO_DEVICE_NAME "Video Device" 52 50 #define ACPI_VIDEO_NOTIFY_SWITCH 0x80
-2
drivers/acpi/video_detect.c
··· 40 40 41 41 #include "internal.h" 42 42 43 - #define PREFIX "ACPI: " 44 - 45 43 ACPI_MODULE_NAME("video"); 46 44 #define _COMPONENT ACPI_VIDEO_COMPONENT 47 45