Commit e346d0cf authored by Hans de Goede's avatar Hans de Goede Committed by Rafael J. Wysocki

ACPI: button: Remove unused acpi_lid_notifier_[un]register() functions

There are no users of the acpi_lid_notifier_[un]register functions,
so lets remove them.
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 00e25036
...@@ -147,7 +147,6 @@ struct acpi_button { ...@@ -147,7 +147,6 @@ struct acpi_button {
bool suspended; bool suspended;
}; };
static BLOCKING_NOTIFIER_HEAD(acpi_lid_notifier);
static struct acpi_device *lid_device; static struct acpi_device *lid_device;
static long lid_init_state = -1; static long lid_init_state = -1;
...@@ -177,7 +176,6 @@ static int acpi_lid_evaluate_state(struct acpi_device *device) ...@@ -177,7 +176,6 @@ static int acpi_lid_evaluate_state(struct acpi_device *device)
static int acpi_lid_notify_state(struct acpi_device *device, int state) static int acpi_lid_notify_state(struct acpi_device *device, int state)
{ {
struct acpi_button *button = acpi_driver_data(device); struct acpi_button *button = acpi_driver_data(device);
int ret;
ktime_t next_report; ktime_t next_report;
bool do_update; bool do_update;
...@@ -254,18 +252,7 @@ static int acpi_lid_notify_state(struct acpi_device *device, int state) ...@@ -254,18 +252,7 @@ static int acpi_lid_notify_state(struct acpi_device *device, int state)
button->last_time = ktime_get(); button->last_time = ktime_get();
} }
ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device); return 0;
if (ret == NOTIFY_DONE)
ret = blocking_notifier_call_chain(&acpi_lid_notifier, state,
device);
if (ret == NOTIFY_DONE || ret == NOTIFY_OK) {
/*
* It is also regarded as success if the notifier_chain
* returns NOTIFY_OK or NOTIFY_DONE.
*/
ret = 0;
}
return ret;
} }
static int __maybe_unused acpi_button_state_seq_show(struct seq_file *seq, static int __maybe_unused acpi_button_state_seq_show(struct seq_file *seq,
...@@ -362,18 +349,6 @@ static int acpi_button_remove_fs(struct acpi_device *device) ...@@ -362,18 +349,6 @@ static int acpi_button_remove_fs(struct acpi_device *device)
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Driver Interface Driver Interface
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
int acpi_lid_notifier_register(struct notifier_block *nb)
{
return blocking_notifier_chain_register(&acpi_lid_notifier, nb);
}
EXPORT_SYMBOL(acpi_lid_notifier_register);
int acpi_lid_notifier_unregister(struct notifier_block *nb)
{
return blocking_notifier_chain_unregister(&acpi_lid_notifier, nb);
}
EXPORT_SYMBOL(acpi_lid_notifier_unregister);
int acpi_lid_open(void) int acpi_lid_open(void)
{ {
if (!lid_device) if (!lid_device)
......
...@@ -2,21 +2,9 @@ ...@@ -2,21 +2,9 @@
#ifndef ACPI_BUTTON_H #ifndef ACPI_BUTTON_H
#define ACPI_BUTTON_H #define ACPI_BUTTON_H
#include <linux/notifier.h>
#if IS_ENABLED(CONFIG_ACPI_BUTTON) #if IS_ENABLED(CONFIG_ACPI_BUTTON)
extern int acpi_lid_notifier_register(struct notifier_block *nb);
extern int acpi_lid_notifier_unregister(struct notifier_block *nb);
extern int acpi_lid_open(void); extern int acpi_lid_open(void);
#else #else
static inline int acpi_lid_notifier_register(struct notifier_block *nb)
{
return 0;
}
static inline int acpi_lid_notifier_unregister(struct notifier_block *nb)
{
return 0;
}
static inline int acpi_lid_open(void) static inline int acpi_lid_open(void)
{ {
return 1; return 1;
......
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