Commit 5d2a3ca8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-misc' 

* acpi-misc:
  ACPI: Make acpi_evaluate_dsm() prototype consistent
  ACPI: wakeup: Remove dead ACPICA debug code
  ACPI: video: Remove leftover ACPICA debug code
  ACPI: tiny-power-button: Remove dead ACPICA debug code
  ACPI: processor: Remove dead ACPICA debug code
  ACPI: proc: Remove dead ACPICA debug code
  ACPI: PCI: Remove unused ACPICA debug code
  ACPI: event: Remove leftover ACPICA debug code
  ACPI: dock: Remove dead ACPICA debug code
  ACPI: debugfs: Remove dead ACPICA debug code
  ACPI: custom_method: Remove dead ACPICA debug code
  ACPI: container: Remove leftover ACPICA debug functionality
  ACPI: platform: Remove ACPI_MODULE_NAME()
  ACPI: memhotplug: Remove leftover ACPICA debug functionality
  ACPI: LPSS: Remove ACPI_MODULE_NAME()
  ACPI: cmos_rtc: Remove leftover ACPI_MODULE_NAME()
  ACPI: Remove three unused inline functions
parents e4174ff7 1e0cb59d

drivers/acpi/acpi_cmos_rtc.c

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 


#include "internal.h"



ACPI_MODULE_NAME("cmos rtc");



static const struct acpi_device_id acpi_cmos_rtc_ids[] = {

	{ "PNP0B00" },

	{ "PNP0B01" },

drivers/acpi/acpi_lpss.c

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 


#include "internal.h"



ACPI_MODULE_NAME("acpi_lpss");



#ifdef CONFIG_X86_INTEL_LPSS



#include <asm/cpu_device_id.h>

drivers/acpi/acpi_memhotplug.c

+0 −7
Original line number Diff line number Diff line
@@ -22,13 +22,6 @@ 
#define ACPI_MEMORY_DEVICE_HID			"PNP0C80"

#define ACPI_MEMORY_DEVICE_NAME			"Hotplug Mem Device"



#define _COMPONENT		ACPI_MEMORY_DEVICE_COMPONENT



#undef PREFIX

#define 	PREFIX		"ACPI:memory_hp:"



ACPI_MODULE_NAME("acpi_memhotplug");



static const struct acpi_device_id memory_device_ids[] = {

	{ACPI_MEMORY_DEVICE_HID, 0},

	{"", 0},

drivers/acpi/acpi_platform.c

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 


#include "internal.h"



ACPI_MODULE_NAME("platform");



static const struct acpi_device_id forbidden_id_list[] = {

	{"PNP0000",  0},	/* PIC */

	{"PNP0100",  0},	/* Timer */

drivers/acpi/container.c

+0 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 


#include "internal.h"



#define _COMPONENT			ACPI_CONTAINER_COMPONENT

ACPI_MODULE_NAME("container");



static const struct acpi_device_id container_device_ids[] = {

	{"ACPI0004", 0},

	{"PNP0A05", 0},

CRA Git | Maintained and supported by SUSTech CRA and CCSE