From: Benjamin Tissoires Date: Wed, 17 Feb 2021 16:14:56 +0000 (+0100) Subject: Revert "HID: playstation: fix unused variable in ps_battery_get_property." X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=57389266a7bd97211522ab138733b4a5a6445f8d;p=users%2Fjedix%2Flinux-maple.git Revert "HID: playstation: fix unused variable in ps_battery_get_property." 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 --- diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c index 408b651174cf4..cc93c16cc8222 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)