forked from Openwrt/openwrt
6b63fcf8df
Backport patch adding support for LED PHY directly in PHY ops struct. Add new PHYLIB_LEDS config and refresh patches. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From af7320ecae0ce646fd2c4a88341a3fbc243553da Mon Sep 17 00:00:00 2001
|
|
From: Yang Li <yang.lee@linux.alibaba.com>
|
|
Date: Thu, 11 May 2023 15:08:20 +0800
|
|
Subject: [PATCH] leds: trigger: netdev: Remove NULL check before dev_{put,
|
|
hold}
|
|
|
|
The call netdev_{put, hold} of dev_{put, hold} will check NULL,
|
|
so there is no need to check before using dev_{put, hold},
|
|
remove it to silence the warnings:
|
|
|
|
./drivers/leds/trigger/ledtrig-netdev.c:291:3-10: WARNING: NULL check before dev_{put, hold} functions is not needed.
|
|
./drivers/leds/trigger/ledtrig-netdev.c:401:2-9: WARNING: NULL check before dev_{put, hold} functions is not needed.
|
|
|
|
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
|
|
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=4929
|
|
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
|
|
Link: https://lore.kernel.org/r/20230511070820.52731-1-yang.lee@linux.alibaba.com
|
|
Signed-off-by: Lee Jones <lee@kernel.org>
|
|
---
|
|
drivers/leds/trigger/ledtrig-netdev.c | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/leds/trigger/ledtrig-netdev.c
|
|
+++ b/drivers/leds/trigger/ledtrig-netdev.c
|
|
@@ -462,8 +462,7 @@ static int netdev_trig_notify(struct not
|
|
get_device_state(trigger_data);
|
|
fallthrough;
|
|
case NETDEV_REGISTER:
|
|
- if (trigger_data->net_dev)
|
|
- dev_put(trigger_data->net_dev);
|
|
+ dev_put(trigger_data->net_dev);
|
|
dev_hold(dev);
|
|
trigger_data->net_dev = dev;
|
|
break;
|
|
@@ -594,8 +593,7 @@ static void netdev_trig_deactivate(struc
|
|
|
|
cancel_delayed_work_sync(&trigger_data->work);
|
|
|
|
- if (trigger_data->net_dev)
|
|
- dev_put(trigger_data->net_dev);
|
|
+ dev_put(trigger_data->net_dev);
|
|
|
|
kfree(trigger_data);
|
|
}
|