Commit e322b75a authored by Jacek Anaszewski's avatar Jacek Anaszewski
Browse files

leds: lm3601x: Use generic support for composing LED names 



Switch to using generic LED support for composing LED class
device name.

Signed-off-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Tested-by: default avatarDan Murphy <dmurphy@ti.com>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
parent 28e12cf4

drivers/leds/leds-lm3601x.c

+17 −21
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/module.h>

#include <linux/regmap.h>

#include <linux/slab.h>

#include <uapi/linux/uleds.h>



#define LM3601X_LED_IR		0x0

#define LM3601X_LED_TORCH	0x1
@@ -90,8 +89,6 @@ struct lm3601x_led { 
	struct regmap *regmap;

	struct mutex lock;



	char led_name[LED_MAX_NAME_SIZE];



	unsigned int flash_timeout;

	unsigned int last_flag;
@@ -322,10 +319,12 @@ static const struct led_flash_ops flash_ops = { 
	.fault_get		= lm3601x_flash_fault_get,

};



static int lm3601x_register_leds(struct lm3601x_led *led)

static int lm3601x_register_leds(struct lm3601x_led *led,

				 struct fwnode_handle *fwnode)

{

	struct led_classdev *led_cdev;

	struct led_flash_setting *setting;

	struct led_init_data init_data = {};



	led->fled_cdev.ops = &flash_ops;
@@ -342,20 +341,25 @@ static int lm3601x_register_leds(struct lm3601x_led *led) 
	setting->val = led->flash_current_max;



	led_cdev = &led->fled_cdev.led_cdev;

	led_cdev->name = led->led_name;

	led_cdev->brightness_set_blocking = lm3601x_brightness_set;

	led_cdev->max_brightness = DIV_ROUND_UP(led->torch_current_max,

						LM3601X_TORCH_REG_DIV);

	led_cdev->flags |= LED_DEV_CAP_FLASH;



	return led_classdev_flash_register(&led->client->dev, &led->fled_cdev);

	init_data.fwnode = fwnode;

	init_data.devicename = led->client->name;

	init_data.default_label = (led->led_mode == LM3601X_LED_TORCH) ?

					"torch" : "infrared";



	return led_classdev_flash_register_ext(&led->client->dev,

						&led->fled_cdev, &init_data);

}



static int lm3601x_parse_node(struct lm3601x_led *led)

static int lm3601x_parse_node(struct lm3601x_led *led,

			      struct fwnode_handle **fwnode)

{

	struct fwnode_handle *child = NULL;

	int ret = -ENODEV;

	const char *name;



	child = device_get_next_child_node(&led->client->dev, child);

	if (!child) {
@@ -376,17 +380,6 @@ static int lm3601x_parse_node(struct lm3601x_led *led) 
		goto out_err;

	}



	ret = fwnode_property_read_string(child, "label", &name);

	if (ret) {

		if (led->led_mode == LM3601X_LED_TORCH)

			name = "torch";

		else

			name = "infrared";

	}



	snprintf(led->led_name, sizeof(led->led_name),

		"%s:%s", led->client->name, name);



	ret = fwnode_property_read_u32(child, "led-max-microamp",

					&led->torch_current_max);

	if (ret) {
@@ -411,6 +404,8 @@ static int lm3601x_parse_node(struct lm3601x_led *led) 
		goto out_err;

	}



	*fwnode = child;



out_err:

	fwnode_handle_put(child);

	return ret;
@@ -419,6 +414,7 @@ static int lm3601x_parse_node(struct lm3601x_led *led) 
static int lm3601x_probe(struct i2c_client *client)

{

	struct lm3601x_led *led;

	struct fwnode_handle *fwnode;

	int ret;



	led = devm_kzalloc(&client->dev, sizeof(*led), GFP_KERNEL);
@@ -428,7 +424,7 @@ static int lm3601x_probe(struct i2c_client *client) 
	led->client = client;

	i2c_set_clientdata(client, led);



	ret = lm3601x_parse_node(led);

	ret = lm3601x_parse_node(led, &fwnode);

	if (ret)

		return -ENODEV;
@@ -442,7 +438,7 @@ static int lm3601x_probe(struct i2c_client *client) 


	mutex_init(&led->lock);



	return lm3601x_register_leds(led);

	return lm3601x_register_leds(led, fwnode);

}



static int lm3601x_remove(struct i2c_client *client)