Skip to contentSkip to conversation

hwmon: (nct6775) Drop duplicate NULL check in ->init() and ->exit()

PATCH Applied Andy Shevchenko 3 participants 3 messages Jun 10, 2022 – Jun 11, 2022 Hardware monitoring

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hwmon: (nct6775) Drop duplicate NULL check in ->init() and ->exit()

Since platform_device_unregister() is NULL-aware, we don't need to duplicate this check. Remove it and fold the rest of the code.

---
 drivers/hwmon/nct6775-platform.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/hwmon/nct6775-platform.c +4 -8
index 6d46c9401898..3a48627419ba 100644
@@ -1200,10 +1200,8 @@ static int __init sensors_nct6775_platform_init(void)
 exit_device_put:
 	platform_device_put(pdev[i]);
 exit_device_unregister:
-	while (--i >= 0) {
-		if (pdev[i])
-			platform_device_unregister(pdev[i]);
-	}
+	while (i--)
+		platform_device_unregister(pdev[i]);
 exit_unregister:
 	platform_driver_unregister(&nct6775_driver);
 	return err;
@@ -1213,10 +1211,8 @@ static void __exit sensors_nct6775_platform_exit(void)
 {
 	int i;
 
-	for (i = 0; i < ARRAY_SIZE(pdev); i++) {
-		if (pdev[i])
-			platform_device_unregister(pdev[i]);
-	}
+	for (i = 0; i < ARRAY_SIZE(pdev); i++)
+		platform_device_unregister(pdev[i]);
 	platform_driver_unregister(&nct6775_driver);
 }
 
Signature · 1 line
2.35.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Andy Shevchenko

Since platform_device_unregister() is NULL-aware, we don't need to duplicate this check. Remove it and fold the rest of the code.

---
drivers/hwmon/nct6775-platform.c | 12 ++++--------

1 file changed, 4 insertions(+), 8 deletions(-)