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

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
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include "internal.h" #include "internal.h"
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[] = {
{ "PNP0B00" }, { "PNP0B00" },
{ "PNP0B01" }, { "PNP0B01" },
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include "internal.h" #include "internal.h"
ACPI_MODULE_NAME("acpi_lpss");
#ifdef CONFIG_X86_INTEL_LPSS #ifdef CONFIG_X86_INTEL_LPSS
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
......
...@@ -22,13 +22,6 @@ ...@@ -22,13 +22,6 @@
#define ACPI_MEMORY_DEVICE_HID "PNP0C80" #define ACPI_MEMORY_DEVICE_HID "PNP0C80"
#define ACPI_MEMORY_DEVICE_NAME "Hotplug Mem Device" #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[] = { static const struct acpi_device_id memory_device_ids[] = {
{ACPI_MEMORY_DEVICE_HID, 0}, {ACPI_MEMORY_DEVICE_HID, 0},
{"", 0}, {"", 0},
......
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
#include "internal.h" #include "internal.h"
ACPI_MODULE_NAME("platform");
static const struct acpi_device_id forbidden_id_list[] = { static const struct acpi_device_id forbidden_id_list[] = {
{"PNP0000", 0}, /* PIC */ {"PNP0000", 0}, /* PIC */
{"PNP0100", 0}, /* Timer */ {"PNP0100", 0}, /* Timer */
......
...@@ -14,9 +14,6 @@ ...@@ -14,9 +14,6 @@
#include "internal.h" #include "internal.h"
#define _COMPONENT ACPI_CONTAINER_COMPONENT
ACPI_MODULE_NAME("container");
static const struct acpi_device_id container_device_ids[] = { static const struct acpi_device_id container_device_ids[] = {
{"ACPI0004", 0}, {"ACPI0004", 0},
{"PNP0A05", 0}, {"PNP0A05", 0},
......
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#include "internal.h" #include "internal.h"
#define _COMPONENT ACPI_SYSTEM_COMPONENT
ACPI_MODULE_NAME("custom_method");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static struct dentry *cm_dentry; static struct dentry *cm_dentry;
......
...@@ -10,9 +10,6 @@ ...@@ -10,9 +10,6 @@
#include "internal.h" #include "internal.h"
#define _COMPONENT ACPI_SYSTEM_COMPONENT
ACPI_MODULE_NAME("debugfs");
struct dentry *acpi_debugfs_dir; struct dentry *acpi_debugfs_dir;
EXPORT_SYMBOL_GPL(acpi_debugfs_dir); EXPORT_SYMBOL_GPL(acpi_debugfs_dir);
......
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include "internal.h" #include "internal.h"
ACPI_MODULE_NAME("dock");
static bool immediate_undock = 1; static bool immediate_undock = 1;
module_param(immediate_undock, bool, 0644); module_param(immediate_undock, bool, 0644);
MODULE_PARM_DESC(immediate_undock, "1 (default) will cause the driver to " MODULE_PARM_DESC(immediate_undock, "1 (default) will cause the driver to "
......
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
#include "internal.h" #include "internal.h"
#define _COMPONENT ACPI_SYSTEM_COMPONENT
ACPI_MODULE_NAME("event");
/* ACPI notifier chain */ /* ACPI notifier chain */
static BLOCKING_NOTIFIER_HEAD(acpi_chain_head); static BLOCKING_NOTIFIER_HEAD(acpi_chain_head);
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include "internal.h" #include "internal.h"
#define _COMPONENT ACPI_PCI_COMPONENT
ACPI_MODULE_NAME("pci_root");
#define ACPI_PCI_ROOT_CLASS "pci_bridge" #define ACPI_PCI_ROOT_CLASS "pci_bridge"
#define ACPI_PCI_ROOT_DEVICE_NAME "PCI Root Bridge" #define ACPI_PCI_ROOT_DEVICE_NAME "PCI Root Bridge"
static int acpi_pci_root_add(struct acpi_device *device, static int acpi_pci_root_add(struct acpi_device *device,
......
...@@ -28,9 +28,6 @@ ...@@ -28,9 +28,6 @@
static int check_sta_before_sun; static int check_sta_before_sun;
#define _COMPONENT ACPI_PCI_COMPONENT
ACPI_MODULE_NAME("pci_slot");
#define SLOT_NAME_SIZE 21 /* Inspired by #define in acpiphp.h */ #define SLOT_NAME_SIZE 21 /* Inspired by #define in acpiphp.h */
struct acpi_pci_slot { struct acpi_pci_slot {
......
...@@ -10,15 +10,11 @@ ...@@ -10,15 +10,11 @@
#include "sleep.h" #include "sleep.h"
#include "internal.h" #include "internal.h"
#define _COMPONENT ACPI_SYSTEM_COMPONENT
/* /*
* this file provides support for: * this file provides support for:
* /proc/acpi/wakeup * /proc/acpi/wakeup
*/ */
ACPI_MODULE_NAME("sleep")
static int static int
acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset) acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
{ {
......
...@@ -14,9 +14,6 @@ ...@@ -14,9 +14,6 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/processor.h> #include <acpi/processor.h>
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
ACPI_MODULE_NAME("processor_core");
static struct acpi_table_madt *get_madt_table(void) static struct acpi_table_madt *get_madt_table(void)
{ {
static struct acpi_table_madt *madt; static struct acpi_table_madt *madt;
......
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#define PREFIX "ACPI: " #define PREFIX "ACPI: "
#define ACPI_PROCESSOR_CLASS "processor" #define ACPI_PROCESSOR_CLASS "processor"
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
ACPI_MODULE_NAME("processor_thermal");
#ifdef CONFIG_CPU_FREQ #ifdef CONFIG_CPU_FREQ
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/button.h> #include <acpi/button.h>
ACPI_MODULE_NAME("tiny-power-button");
MODULE_AUTHOR("Josh Triplett"); MODULE_AUTHOR("Josh Triplett");
MODULE_DESCRIPTION("ACPI Tiny Power Button Driver"); MODULE_DESCRIPTION("ACPI Tiny Power Button Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -35,9 +35,6 @@ ...@@ -35,9 +35,6 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <acpi/video.h> #include <acpi/video.h>
ACPI_MODULE_NAME("video");
#define _COMPONENT ACPI_VIDEO_COMPONENT
void acpi_video_unregister_backlight(void); void acpi_video_unregister_backlight(void);
static bool backlight_notifier_registered; static bool backlight_notifier_registered;
......
...@@ -26,8 +26,6 @@ static DEFINE_MUTEX(acpi_wakeup_handler_mutex); ...@@ -26,8 +26,6 @@ static DEFINE_MUTEX(acpi_wakeup_handler_mutex);
* suspend/resume and isn't really required as this is called in S-state. At * suspend/resume and isn't really required as this is called in S-state. At
* that time, there is no device hotplug * that time, there is no device hotplug
**/ **/
#define _COMPONENT ACPI_SYSTEM_COMPONENT
ACPI_MODULE_NAME("wakeup_devices")
/** /**
* acpi_enable_wakeup_devices - Enable wake-up device GPEs. * acpi_enable_wakeup_devices - Enable wake-up device GPEs.
......
...@@ -865,7 +865,7 @@ static inline bool acpi_driver_match_device(struct device *dev, ...@@ -865,7 +865,7 @@ static inline bool acpi_driver_match_device(struct device *dev,
static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle, static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle,
const guid_t *guid, const guid_t *guid,
int rev, int func, u64 rev, u64 func,
union acpi_object *argv4) union acpi_object *argv4)
{ {
return NULL; return NULL;
...@@ -977,8 +977,6 @@ int acpi_subsys_runtime_suspend(struct device *dev); ...@@ -977,8 +977,6 @@ int acpi_subsys_runtime_suspend(struct device *dev);
int acpi_subsys_runtime_resume(struct device *dev); int acpi_subsys_runtime_resume(struct device *dev);
int acpi_dev_pm_attach(struct device *dev, bool power_on); int acpi_dev_pm_attach(struct device *dev, bool power_on);
#else #else
static inline int acpi_dev_runtime_suspend(struct device *dev) { return 0; }
static inline int acpi_dev_runtime_resume(struct device *dev) { return 0; }
static inline int acpi_subsys_runtime_suspend(struct device *dev) { return 0; } static inline int acpi_subsys_runtime_suspend(struct device *dev) { return 0; }
static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; } static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; }
static inline int acpi_dev_pm_attach(struct device *dev, bool power_on) static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)
...@@ -1216,13 +1214,6 @@ static inline int acpi_node_prop_get(const struct fwnode_handle *fwnode, ...@@ -1216,13 +1214,6 @@ static inline int acpi_node_prop_get(const struct fwnode_handle *fwnode,
return -ENXIO; return -ENXIO;
} }
static inline int acpi_dev_prop_get(const struct acpi_device *adev,
const char *propname,
void **valptr)
{
return -ENXIO;
}
static inline int acpi_dev_prop_read_single(const struct acpi_device *adev, static inline int acpi_dev_prop_read_single(const struct acpi_device *adev,
const char *propname, const char *propname,
enum dev_prop_type proptype, enum dev_prop_type proptype,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment