This reverts commit 3847d15b41ce ("HID: playstation: fix unused variable
in ps_battery_get_property.")
There is currently an ongoing discussion on linux-leds LKML,
and so to give us more room, we need to revert those related
LEDs patches from linux-next.
To have a cleaner merge with the new version, we also revert
all patches on top of the LED ones.
This is not a big deal, they are still not pushed to Linus.
Signed-off-by: Benjamin Tissoires <[email protected]>
---
drivers/hid/hid-playstation.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
index 408b651174cf..cc93c16cc822 100644
--- a/drivers/hid/hid-playstation.c
+++ b/drivers/hid/hid-playstation.c
@@ -391,7 +391,7 @@ static int ps_battery_get_property(struct power_supply *psy,
uint8_t battery_capacity;
int battery_status;
unsigned long flags;
- int ret = 0;
+ int ret;
spin_lock_irqsave(&dev->lock, flags);
battery_capacity = dev->battery_capacity;
@@ -416,7 +416,7 @@ static int ps_battery_get_property(struct power_supply *psy,
break;
}
- return ret;
+ return 0;
}
static int ps_device_register_battery(struct ps_device *dev)
--
2.29.2