platform/x86: thinkpad_acpi: Drop superfluous exported function
Since we've switched to the LED trigger for binding with HD-audio, we can drop the exported function as well as the whole linux/thinkpad_acpi.h. The own TPACPI_LED_MUTE and TPACPI_LED_MICMUTE definitions are replaced with the identical ones for LEDS, i.e. LED_AUDIO_MUTE and LED_AUDIO_MICMUTE, respectively. They are no longer needed as referred only locally. Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com> Acked-by: Pavel Machek <pavel@ucw.cz> Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Acked-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Родитель
f783e128a6
Коммит
9e908a180e
|
@ -81,7 +81,6 @@
|
|||
#include <linux/acpi.h>
|
||||
#include <linux/pci_ids.h>
|
||||
#include <linux/power_supply.h>
|
||||
#include <linux/thinkpad_acpi.h>
|
||||
#include <sound/core.h>
|
||||
#include <sound/control.h>
|
||||
#include <sound/initval.h>
|
||||
|
@ -9150,6 +9149,7 @@ static struct ibm_struct fan_driver_data = {
|
|||
* Mute LED subdriver
|
||||
*/
|
||||
|
||||
#define TPACPI_LED_MAX 2
|
||||
|
||||
struct tp_led_table {
|
||||
acpi_string name;
|
||||
|
@ -9158,13 +9158,13 @@ struct tp_led_table {
|
|||
int state;
|
||||
};
|
||||
|
||||
static struct tp_led_table led_tables[] = {
|
||||
[TPACPI_LED_MUTE] = {
|
||||
static struct tp_led_table led_tables[TPACPI_LED_MAX] = {
|
||||
[LED_AUDIO_MUTE] = {
|
||||
.name = "SSMS",
|
||||
.on_value = 1,
|
||||
.off_value = 0,
|
||||
},
|
||||
[TPACPI_LED_MICMUTE] = {
|
||||
[LED_AUDIO_MICMUTE] = {
|
||||
.name = "MMTS",
|
||||
.on_value = 2,
|
||||
.off_value = 0,
|
||||
|
@ -9189,40 +9189,36 @@ static int mute_led_on_off(struct tp_led_table *t, bool state)
|
|||
return state;
|
||||
}
|
||||
|
||||
int tpacpi_led_set(int whichled, bool on)
|
||||
static int tpacpi_led_set(int whichled, bool on)
|
||||
{
|
||||
struct tp_led_table *t;
|
||||
|
||||
if (whichled < 0 || whichled >= TPACPI_LED_MAX)
|
||||
return -EINVAL;
|
||||
|
||||
t = &led_tables[whichled];
|
||||
if (t->state < 0 || t->state == on)
|
||||
return t->state;
|
||||
return mute_led_on_off(t, on);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(tpacpi_led_set);
|
||||
|
||||
static int tpacpi_led_mute_set(struct led_classdev *led_cdev,
|
||||
enum led_brightness brightness)
|
||||
{
|
||||
return tpacpi_led_set(TPACPI_LED_MUTE, brightness != LED_OFF);
|
||||
return tpacpi_led_set(LED_AUDIO_MUTE, brightness != LED_OFF);
|
||||
}
|
||||
|
||||
static int tpacpi_led_micmute_set(struct led_classdev *led_cdev,
|
||||
enum led_brightness brightness)
|
||||
{
|
||||
return tpacpi_led_set(TPACPI_LED_MICMUTE, brightness != LED_OFF);
|
||||
return tpacpi_led_set(LED_AUDIO_MICMUTE, brightness != LED_OFF);
|
||||
}
|
||||
|
||||
static struct led_classdev mute_led_cdev[] = {
|
||||
[TPACPI_LED_MUTE] = {
|
||||
static struct led_classdev mute_led_cdev[TPACPI_LED_MAX] = {
|
||||
[LED_AUDIO_MUTE] = {
|
||||
.name = "platform::mute",
|
||||
.max_brightness = 1,
|
||||
.brightness_set_blocking = tpacpi_led_mute_set,
|
||||
.default_trigger = "audio-mute",
|
||||
},
|
||||
[TPACPI_LED_MICMUTE] = {
|
||||
[LED_AUDIO_MICMUTE] = {
|
||||
.name = "platform::micmute",
|
||||
.max_brightness = 1,
|
||||
.brightness_set_blocking = tpacpi_led_micmute_set,
|
||||
|
@ -9232,10 +9228,6 @@ static struct led_classdev mute_led_cdev[] = {
|
|||
|
||||
static int mute_led_init(struct ibm_init_struct *iibm)
|
||||
{
|
||||
static enum led_audio types[] = {
|
||||
[TPACPI_LED_MUTE] = LED_AUDIO_MUTE,
|
||||
[TPACPI_LED_MICMUTE] = LED_AUDIO_MICMUTE,
|
||||
};
|
||||
acpi_handle temp;
|
||||
int i, err;
|
||||
|
||||
|
@ -9246,7 +9238,7 @@ static int mute_led_init(struct ibm_init_struct *iibm)
|
|||
continue;
|
||||
}
|
||||
|
||||
mute_led_cdev[i].brightness = ledtrig_audio_get(types[i]);
|
||||
mute_led_cdev[i].brightness = ledtrig_audio_get(i);
|
||||
err = led_classdev_register(&tpacpi_pdev->dev, &mute_led_cdev[i]);
|
||||
if (err < 0) {
|
||||
while (i--) {
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef __THINKPAD_ACPI_H__
|
||||
#define __THINKPAD_ACPI_H__
|
||||
|
||||
/* These two functions return 0 if success, or negative error code
|
||||
(e g -ENODEV if no led present) */
|
||||
|
||||
enum {
|
||||
TPACPI_LED_MUTE,
|
||||
TPACPI_LED_MICMUTE,
|
||||
TPACPI_LED_MAX,
|
||||
};
|
||||
|
||||
int tpacpi_led_set(int whichled, bool on);
|
||||
|
||||
#endif
|
Загрузка…
Ссылка в новой задаче