leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

leds: max77650: Switch to fwnode property API

Browse Source 
Switch the max77650 from OF to the fwnode property API.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
This commit is contained in:
Andy Shevchenko 2019-08-22 18:19:27 +03:00 committed by Jacek Anaszewski
parent 60e2dde1e9
commit ae6c4c70df
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/leds/leds-max77650.c
View File

@ -62,7 +62,7 @@ static int max77650_led_brightness_set(struct led_classdev *cdev,
static int max77650_led_probe(struct platform_device *pdev)
{
struct device_node *of_node, *child;
struct fwnode_handle *child;
struct max77650_led *leds, *led;
struct device *dev;
struct regmap *map;
@ -71,10 +71,6 @@ static int max77650_led_probe(struct platform_device *pdev)
u32 reg;
dev = &pdev->dev;
of_node = dev->of_node;
if (!of_node)
return -ENODEV;
leds = devm_kcalloc(dev, sizeof(*leds),
MAX77650_LED_NUM_LEDS, GFP_KERNEL);
@ -85,12 +81,12 @@ static int max77650_led_probe(struct platform_device *pdev)
if (!map)
return -ENODEV;
num_leds = of_get_child_count(of_node);
num_leds = device_get_child_node_count(dev);
if (!num_leds || num_leds > MAX77650_LED_NUM_LEDS)
return -ENODEV;
for_each_child_of_node(of_node, child) {
rv = of_property_read_u32(child, "reg", &reg);
device_for_each_child_node(dev, child) {
rv = fwnode_property_read_u32(child, "reg", &reg);
if (rv || reg >= MAX77650_LED_NUM_LEDS) {
rv = -EINVAL;
goto err_node_put;
@ -103,8 +99,8 @@ static int max77650_led_probe(struct platform_device *pdev)
led->cdev.brightness_set_blocking = max77650_led_brightness_set;
led->cdev.max_brightness = MAX77650_LED_MAX_BRIGHTNESS;
label = of_get_property(child, "label", NULL);
if (!label) {
rv = fwnode_property_read_string(child, "label", &label);
if (rv) {
led->cdev.name = "max77650::";
} else {
led->cdev.name = devm_kasprintf(dev, GFP_KERNEL,
@ -115,8 +111,8 @@ static int max77650_led_probe(struct platform_device *pdev)
}
}
of_property_read_string(child, "linux,default-trigger",
&led->cdev.default_trigger);
fwnode_property_read_string(child, "linux,default-trigger",
&led->cdev.default_trigger);
rv = devm_led_classdev_register(dev, &led->cdev);
if (rv)
@ -135,7 +131,7 @@ static int max77650_led_probe(struct platform_device *pdev)
MAX77650_REG_CNFG_LED_TOP,
MAX77650_LED_TOP_DEFAULT);
err_node_put:
of_node_put(child);
fwnode_handle_put(child);
return rv;
}