leds: max5970: Allow to use on non-OF platforms
cover leds: max5970: Allow to use on non-OF platforms
Allow to use driver on non-OF platforms and other cleanups.
Andy Shevchenko (4):
leds: max5970: Remove unused variable
leds: max5970: Make use of device properties
leds: max5970: Make use of dev_err_probe()
leds: max5970: Add missing headers
drivers/leds/leds-max5970.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-)
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
PATCH 1/4 leds: max5970: Remove unused variable
leds-max5970.c:50:21: warning: variable 'num_leds' set but not used [-Wunused-but-set-variable]
Remove unused variable.
--- drivers/leds/leds-max5970.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/leds/leds-max5970.c +1 -2
@@ -45,7 +45,7 @@ static int max5970_led_probe(struct platform_device *pdev)struct regmap *regmap;struct device_node *led_node, *child;struct max5970_led *ddata; -int ret = -ENODEV , num_leds =0 ; +int ret = -ENODEV ; regmap =dev_get_regmap (pdev->dev.parent,NULL );if (!regmap)
@@ -89,7 +89,6 @@ static int max5970_led_probe(struct platform_device *pdev)dev_err (dev,"Failed to initialize LED %u\n" , reg);return ret; } - num_leds++; }return ret;
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
PATCH 2/4 leds: max5970: Make use of device properties
In reply to Andy ShevchenkoConvert the module to be property provider agnostic and allow it to be used on non-OF platforms.
Add mod_devicetable.h include.
--- drivers/leds/leds-max5970.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/leds/leds-max5970.c +12 -12
@@ -9,8 +9,9 @@#include <linux/leds.h> #include <linux/mfd/max5970.h> -#include <linux/of.h> +#include <linux/mod_devicetable.h> #include <linux/platform_device.h> +#include <linux/property.h> #include <linux/regmap.h> #define ldev_to_maxled (c) container_of(c, struct max5970_led, cdev)
@@ -40,25 +41,24 @@ static int max5970_led_set_brightness(struct led_classdev *cdev,static int max5970_led_probe (struct platform_device *pdev) { +struct fwnode_handle *led_node, *child;struct device *dev = &pdev->dev; -struct device_node *np =dev_of_node (dev->parent);struct regmap *regmap; -struct device_node *led_node, *child;struct max5970_led *ddata;int ret = -ENODEV ; - regmap =dev_get_regmap (pdev->dev.parent,NULL ); + regmap =dev_get_regmap (dev->parent,NULL );if (!regmap)return -ENODEV ; - led_node =of_get_child_by_name (np,"leds" ); + led_node =device_get_named_child_node (dev->parent,"leds" );if (!led_node)return -ENODEV ; -for_each_available_child_of_node (led_node, child) { +fwnode_for_each_available_child_node (led_node, child) {u32 reg; -if (of_property_read_u32 (child,"reg" , ®)) +if (fwnode_property_read_u32 (child,"reg" , ®))continue ;if (reg >=MAX5970_NUM_LEDS ) {
@@ -68,7 +68,7 @@ static int max5970_led_probe(struct platform_device *pdev) ddata =devm_kzalloc (dev,sizeof (*ddata),GFP_KERNEL );if (!ddata) { -of_node_put (child); +fwnode_handle_put (child);return -ENOMEM ; }
@@ -76,8 +76,8 @@ static int max5970_led_probe(struct platform_device *pdev) ddata->regmap = regmap; ddata->dev = dev; -if (of_property_read_string (child,"label" , &ddata->cdev.name)) - ddata->cdev.name = child->name; +if (fwnode_property_read_string (child,"label" , &ddata->cdev.name)) + ddata->cdev.name =fwnode_get_name (child); ddata->cdev.max_brightness =1 ; ddata->cdev.brightness_set_blocking = max5970_led_set_brightness;
@@ -85,7 +85,7 @@ static int max5970_led_probe(struct platform_device *pdev) ret =devm_led_classdev_register (dev, &ddata->cdev);if (ret <0 ) { -of_node_put (child); +fwnode_handle_put (child);dev_err (dev,"Failed to initialize LED %u\n" , reg);return ret; }
@@ -100,8 +100,8 @@ static struct platform_driver max5970_led_driver = { }, .probe = max5970_led_probe, }; -module_platform_driver (max5970_led_driver); +MODULE_AUTHOR ("Patrick Rudolph <[email protected]>" );MODULE_AUTHOR ("Naresh Solanki <[email protected]>" );MODULE_DESCRIPTION ("MAX5970_hot-swap controller LED driver" );
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
PATCH 3/4 leds: max5970: Make use of dev_err_probe()
In reply to Andy ShevchenkoSimplify the error handling in probe function by switching from dev_err() to dev_err_probe().
--- drivers/leds/leds-max5970.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/leds/leds-max5970.c +2 -3
@@ -62,7 +62,7 @@ static int max5970_led_probe(struct platform_device *pdev)continue ;if (reg >=MAX5970_NUM_LEDS ) { -dev_err (dev,"invalid LED (%u >= %d)\n" , reg,MAX5970_NUM_LEDS ); +dev_err_probe (dev, -EINVAL ,"invalid LED (%u >= %d)\n" , reg,MAX5970_NUM_LEDS );continue ; }
@@ -86,8 +86,7 @@ static int max5970_led_probe(struct platform_device *pdev) ret =devm_led_classdev_register (dev, &ddata->cdev);if (ret <0 ) {fwnode_handle_put (child); -dev_err (dev,"Failed to initialize LED %u\n" , reg); -return ret; +return dev_err_probe (dev, ret,"Failed to initialize LED %u\n" , reg); } }
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
PATCH 4/4 leds: max5970: Add missing headers
In reply to Andy ShevchenkoDon't inherit headers "by chance" from others.
Include the needed ones explicitly.
--- drivers/leds/leds-max5970.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/leds/leds-max5970.c +4 -0
@@ -7,9 +7,13 @@* Author: Patrick Rudolph <[email protected]> */ +#include <linux/bits.h> +#include <linux/container_of.h> +#include <linux/device.h> #include <linux/leds.h> #include <linux/mfd/max5970.h> #include <linux/mod_devicetable.h> +#include <linux/module.h> #include <linux/platform_device.h> #include <linux/property.h> #include <linux/regmap.h>
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
Quoted 9 lines · Andy Shevchenko
Allow to use driver on non-OF platforms and other cleanups.
Andy Shevchenko (4):
leds: max5970: Remove unused variable
leds: max5970: Make use of device properties
leds: max5970: Make use ofdev_err_probe()
leds: max5970: Add missing headers[...]
Applied, thanks!
[1/4] leds: max5970: Remove unused variable
commit: d3578b4982e6ebccbd898806ac86b2db4b2bcc5e
[2/4] leds: max5970: Make use of device properties
commit: 6d63d05e26f8d5e22308efc25793660101fd7602
[3/4] leds: max5970: Make use of dev_err_probe()
commit: e7baa5b437a782308b86c1517ae252fd1353eb0b
[4/4] leds: max5970: Add missing headers
commit: 808c7881876756dfcd8c4d0c3efc27c9262da822--
Lee Jones [李琼斯]