Skip to contentSkip to conversation

leds: trigger: netdev: NULL check before dev_{put, hold}

PATCH In review Yang Li 2 participants 2 messages May 11, 2023 – May 18, 2023 LED

lore
Share & tools
lore

Yang Li

author
#0 lore raw

PATCH 1/1 leds: trigger: netdev: 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.

---
 drivers/leds/trigger/ledtrig-netdev.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/leds/trigger/ledtrig-netdev.c +2 -4
index 305eb543ba84..92de22be5f1c 100644
@@ -287,8 +287,7 @@ static int netdev_trig_notify(struct notifier_block *nb,
 		trigger_data->carrier_link_up = netif_carrier_ok(dev);
 		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;
@@ -397,8 +396,7 @@ static void netdev_trig_deactivate(struct led_classdev *led_cdev)
 
 	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);
 }
Signature · 1 line
2.20.1.7.g153144c
maintainer
#1 lore raw
Quoted 7 lines · Yang Li

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.

Quoted 6 lines
---
 drivers/leds/trigger/ledtrig-netdev.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Don't forget to run checkpatch.pl before submission.

WARNING: Reported-by: should be immediately followed by Closes: with a URL to the report

Fixed and applied, thanks.

Signature · 1 line
Lee Jones [李琼斯]