824-v6.5-leds-trigger-netdev-Remove-NULL-check-before-dev_-pu.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. From af7320ecae0ce646fd2c4a88341a3fbc243553da Mon Sep 17 00:00:00 2001
  2. From: Yang Li <[email protected]>
  3. Date: Thu, 11 May 2023 15:08:20 +0800
  4. Subject: [PATCH] leds: trigger: netdev: Remove NULL check before dev_{put,
  5. hold}
  6. The call netdev_{put, hold} of dev_{put, hold} will check NULL,
  7. so there is no need to check before using dev_{put, hold},
  8. remove it to silence the warnings:
  9. ./drivers/leds/trigger/ledtrig-netdev.c:291:3-10: WARNING: NULL check before dev_{put, hold} functions is not needed.
  10. ./drivers/leds/trigger/ledtrig-netdev.c:401:2-9: WARNING: NULL check before dev_{put, hold} functions is not needed.
  11. Reported-by: Abaci Robot <[email protected]>
  12. Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=4929
  13. Signed-off-by: Yang Li <[email protected]>
  14. Link: https://lore.kernel.org/r/[email protected]
  15. Signed-off-by: Lee Jones <[email protected]>
  16. ---
  17. drivers/leds/trigger/ledtrig-netdev.c | 6 ++----
  18. 1 file changed, 2 insertions(+), 4 deletions(-)
  19. --- a/drivers/leds/trigger/ledtrig-netdev.c
  20. +++ b/drivers/leds/trigger/ledtrig-netdev.c
  21. @@ -462,8 +462,7 @@ static int netdev_trig_notify(struct not
  22. get_device_state(trigger_data);
  23. fallthrough;
  24. case NETDEV_REGISTER:
  25. - if (trigger_data->net_dev)
  26. - dev_put(trigger_data->net_dev);
  27. + dev_put(trigger_data->net_dev);
  28. dev_hold(dev);
  29. trigger_data->net_dev = dev;
  30. break;
  31. @@ -594,8 +593,7 @@ static void netdev_trig_deactivate(struc
  32. cancel_delayed_work_sync(&trigger_data->work);
  33. - if (trigger_data->net_dev)
  34. - dev_put(trigger_data->net_dev);
  35. + dev_put(trigger_data->net_dev);
  36. kfree(trigger_data);
  37. }