From: Roderick Colenbrander <roderick.colenbran...@sony.com>
This reverts commit c240f0cb88ec ("HID: playstation: add
DualSense player LEDs support.")
There is currently an ongoing discussion on linux-leds LKML,
and so to give us more room, we need to revert those related
patches from linux-next.
This is not a big deal, they are still not pushed to Linus.
Signed-off-by: Roderick Colenbrander <roderick.colenbran...@sony.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoi...@redhat.com>
---
drivers/hid/hid-playstation.c | 60 +----------------------------------
1 file changed, 1 insertion(+), 59 deletions(-)
diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
index 2d96785c397d..c436ac8f7a6f 100644
--- a/drivers/hid/hid-playstation.c
+++ b/drivers/hid/hid-playstation.c
@@ -112,7 +112,6 @@ struct ps_led_info {
#define DS_OUTPUT_VALID_FLAG1_POWER_SAVE_CONTROL_ENABLE BIT(1)
#define DS_OUTPUT_VALID_FLAG1_LIGHTBAR_CONTROL_ENABLE BIT(2)
#define DS_OUTPUT_VALID_FLAG1_RELEASE_LEDS BIT(3)
-#define DS_OUTPUT_VALID_FLAG1_PLAYER_INDICATOR_CONTROL_ENABLE BIT(4)
#define DS_OUTPUT_VALID_FLAG2_LIGHTBAR_SETUP_CONTROL_ENABLE BIT(1)
#define DS_OUTPUT_POWER_SAVE_CONTROL_MIC_MUTE BIT(4)
#define DS_OUTPUT_LIGHTBAR_SETUP_LIGHT_OUT BIT(1)
@@ -158,11 +157,6 @@ struct dualsense {
bool last_btn_mic_state;
struct led_classdev mute_led;
- /* Player leds */
- bool update_player_leds;
- uint8_t player_leds_state;
- struct led_classdev player_leds[5];
-
struct work_struct output_worker;
void *output_report_dmabuf;
uint8_t output_seq; /* Sequence number for output report. */
@@ -784,35 +778,6 @@ static void dualsense_mute_led_set_brightness(struct
led_classdev *led, enum led
}
-static enum led_brightness dualsense_player_led_get_brightness(struct
led_classdev *led)
-{
- struct hid_device *hdev = to_hid_device(led->dev->parent);
- struct dualsense *ds = hid_get_drvdata(hdev);
-
- return !!(ds->player_leds_state & BIT(led - ds->player_leds));
-}
-
-static void dualsense_player_led_set_brightness(struct led_classdev *led, enum
led_brightness value)
-{
- struct hid_device *hdev = to_hid_device(led->dev->parent);
- struct dualsense *ds = hid_get_drvdata(hdev);
- unsigned long flags;
- unsigned int led_index;
-
- spin_lock_irqsave(&ds->base.lock, flags);
-
- led_index = led - ds->player_leds;
- if (value == LED_OFF)
- ds->player_leds_state &= ~BIT(led_index);
- else
- ds->player_leds_state |= BIT(led_index);
-
- ds->update_player_leds = true;
- spin_unlock_irqrestore(&ds->base.lock, flags);
-
- schedule_work(&ds->output_worker);
-}
-
static void dualsense_init_output_report(struct dualsense *ds, struct
dualsense_output_report *rp,
void *buf)
{
@@ -905,13 +870,6 @@ static void dualsense_output_worker(struct work_struct
*work)
ds->update_lightbar = false;
}
- if (ds->update_player_leds) {
- common->valid_flag1 |=
DS_OUTPUT_VALID_FLAG1_PLAYER_INDICATOR_CONTROL_ENABLE;
- common->player_leds = ds->player_leds_state;
-
- ds->update_player_leds = false;
- }
-
if (ds->update_mic_mute) {
common->valid_flag1 |=
DS_OUTPUT_VALID_FLAG1_MIC_MUTE_LED_CONTROL_ENABLE;
common->mute_button_led = ds->mic_muted;
@@ -1161,20 +1119,12 @@ static struct ps_device *dualsense_create(struct
hid_device *hdev)
struct dualsense *ds;
struct ps_device *ps_dev;
uint8_t max_output_report_size;
- int i, ret;
+ int ret;
static const struct ps_led_info mute_led_info = {
"micmute", dualsense_mute_led_get_brightness,
dualsense_mute_led_set_brightness
};
- static const struct ps_led_info player_leds_info[] = {
- { "led1", dualsense_player_led_get_brightness,
dualsense_player_led_set_brightness },
- { "led2", dualsense_player_led_get_brightness,
dualsense_player_led_set_brightness },
- { "led3", dualsense_player_led_get_brightness,
dualsense_player_led_set_brightness },
- { "led4", dualsense_player_led_get_brightness,
dualsense_player_led_set_brightness },
- { "led5", dualsense_player_led_get_brightness,
dualsense_player_led_set_brightness }
- };
-
ds = devm_kzalloc(&hdev->dev, sizeof(*ds), GFP_KERNEL);
if (!ds)
return ERR_PTR(-ENOMEM);
@@ -1256,14 +1206,6 @@ static struct ps_device *dualsense_create(struct
hid_device *hdev)
if (ret)
goto err;
- for (i = 0; i < ARRAY_SIZE(player_leds_info); i++) {
- const struct ps_led_info *led_info = &player_leds_info[i];
-
- ret = ps_led_register(ps_dev, &ds->player_leds[i], led_info);
- if (ret < 0)
- goto err;
- }
-
return &ds->base;
err:
--
2.29.2
