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>
This commit is contained in:
Родитель
730bf5ebb4
Коммит
07070e12cf
|
@ -18,8 +18,6 @@
|
||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#define PREFIX "ACPI: "
|
|
||||||
|
|
||||||
ACPI_MODULE_NAME("cmos rtc");
|
ACPI_MODULE_NAME("cmos rtc");
|
||||||
|
|
||||||
static const struct acpi_device_id acpi_cmos_rtc_ids[] = {
|
static const struct acpi_device_id acpi_cmos_rtc_ids[] = {
|
||||||
|
|
|
@ -31,8 +31,6 @@
|
||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#define PREFIX "ACPI: "
|
|
||||||
|
|
||||||
#define _COMPONENT ACPI_CONTAINER_COMPONENT
|
#define _COMPONENT ACPI_CONTAINER_COMPONENT
|
||||||
ACPI_MODULE_NAME("container");
|
ACPI_MODULE_NAME("container");
|
||||||
|
|
||||||
|
|
|
@ -35,8 +35,6 @@
|
||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#define PREFIX "ACPI: "
|
|
||||||
|
|
||||||
#define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver"
|
#define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver"
|
||||||
|
|
||||||
ACPI_MODULE_NAME("dock");
|
ACPI_MODULE_NAME("dock");
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
|
|
||||||
#define _COMPONENT ACPI_OS_SERVICES
|
#define _COMPONENT ACPI_OS_SERVICES
|
||||||
ACPI_MODULE_NAME("osl");
|
ACPI_MODULE_NAME("osl");
|
||||||
#define PREFIX "ACPI: "
|
|
||||||
struct acpi_os_dpc {
|
struct acpi_os_dpc {
|
||||||
acpi_osd_exec_callback function;
|
acpi_osd_exec_callback function;
|
||||||
void *context;
|
void *context;
|
||||||
|
|
|
@ -43,8 +43,6 @@
|
||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#define PREFIX "ACPI: "
|
|
||||||
|
|
||||||
#define _COMPONENT ACPI_PCI_COMPONENT
|
#define _COMPONENT ACPI_PCI_COMPONENT
|
||||||
ACPI_MODULE_NAME("pci_link");
|
ACPI_MODULE_NAME("pci_link");
|
||||||
#define ACPI_PCI_LINK_CLASS "pci_irq_routing"
|
#define ACPI_PCI_LINK_CLASS "pci_irq_routing"
|
||||||
|
|
|
@ -39,8 +39,6 @@
|
||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#define PREFIX "ACPI: "
|
|
||||||
|
|
||||||
#define _COMPONENT ACPI_PCI_COMPONENT
|
#define _COMPONENT ACPI_PCI_COMPONENT
|
||||||
ACPI_MODULE_NAME("pci_root");
|
ACPI_MODULE_NAME("pci_root");
|
||||||
#define ACPI_PCI_ROOT_CLASS "pci_bridge"
|
#define ACPI_PCI_ROOT_CLASS "pci_bridge"
|
||||||
|
|
|
@ -46,8 +46,6 @@
|
||||||
#include "sleep.h"
|
#include "sleep.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#define PREFIX "ACPI: "
|
|
||||||
|
|
||||||
#define _COMPONENT ACPI_POWER_COMPONENT
|
#define _COMPONENT ACPI_POWER_COMPONENT
|
||||||
ACPI_MODULE_NAME("power");
|
ACPI_MODULE_NAME("power");
|
||||||
#define ACPI_POWER_CLASS "power_resource"
|
#define ACPI_POWER_CLASS "power_resource"
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#define PREFIX "ACPI: "
|
|
||||||
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
|
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
|
||||||
ACPI_MODULE_NAME("processor_core");
|
ACPI_MODULE_NAME("processor_core");
|
||||||
|
|
||||||
|
|
|
@ -41,8 +41,6 @@
|
||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#define PREFIX "ACPI: "
|
|
||||||
|
|
||||||
#define ACPI_PROCESSOR_NOTIFY_PERFORMANCE 0x80
|
#define ACPI_PROCESSOR_NOTIFY_PERFORMANCE 0x80
|
||||||
#define ACPI_PROCESSOR_NOTIFY_POWER 0x81
|
#define ACPI_PROCESSOR_NOTIFY_POWER 0x81
|
||||||
#define ACPI_PROCESSOR_NOTIFY_THROTTLING 0x82
|
#define ACPI_PROCESSOR_NOTIFY_THROTTLING 0x82
|
||||||
|
|
|
@ -12,8 +12,6 @@
|
||||||
#define _COMPONENT ACPI_SYSTEM_COMPONENT
|
#define _COMPONENT ACPI_SYSTEM_COMPONENT
|
||||||
ACPI_MODULE_NAME("sysfs");
|
ACPI_MODULE_NAME("sysfs");
|
||||||
|
|
||||||
#define PREFIX "ACPI: "
|
|
||||||
|
|
||||||
#ifdef CONFIG_ACPI_DEBUG
|
#ifdef CONFIG_ACPI_DEBUG
|
||||||
/*
|
/*
|
||||||
* ACPI debug sysfs I/F, including:
|
* ACPI debug sysfs I/F, including:
|
||||||
|
|
|
@ -45,8 +45,6 @@
|
||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#define PREFIX "ACPI: "
|
|
||||||
|
|
||||||
#define ACPI_VIDEO_BUS_NAME "Video Bus"
|
#define ACPI_VIDEO_BUS_NAME "Video Bus"
|
||||||
#define ACPI_VIDEO_DEVICE_NAME "Video Device"
|
#define ACPI_VIDEO_DEVICE_NAME "Video Device"
|
||||||
#define ACPI_VIDEO_NOTIFY_SWITCH 0x80
|
#define ACPI_VIDEO_NOTIFY_SWITCH 0x80
|
||||||
|
|
|
@ -40,8 +40,6 @@
|
||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#define PREFIX "ACPI: "
|
|
||||||
|
|
||||||
ACPI_MODULE_NAME("video");
|
ACPI_MODULE_NAME("video");
|
||||||
#define _COMPONENT ACPI_VIDEO_COMPONENT
|
#define _COMPONENT ACPI_VIDEO_COMPONENT
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче