Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07070e12 authored by Hanjun Guo's avatar Hanjun Guo Committed by Rafael J. Wysocki
Browse files

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: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 730bf5eb

drivers/acpi/acpi_cmos_rtc.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -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[] = {

drivers/acpi/container.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -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");

drivers/acpi/dock.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -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");

drivers/acpi/osl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

drivers/acpi/pci_link.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -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"