leds: max77650: Switch to fwnode property API (ae6c4c70) · Commits · 戴 / test

drivers/leds/leds-max77650.c

+9 −13

Original line number	Diff line number	Diff line
		@@ -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,7 +111,7 @@ static int max77650_led_probe(struct platform_device *pdev)
		}
		}

		of_property_read_string(child, "linux,default-trigger",
		fwnode_property_read_string(child, "linux,default-trigger",
		&led->cdev.default_trigger);

		rv = devm_led_classdev_register(dev, &led->cdev);
		@@ -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;
		}

Admin message