leds: is31fl319x: Make use of device properties
PATCH 1/5 leds: is31fl319x: Make use of device properties
Convert the module to be property provider agnostic and allow it to be used on non-OF platforms.
Add mod_devicetable.h include.
--- drivers/leds/Kconfig | 2 +- drivers/leds/leds-is31fl319x.c | 44 ++++++++++++++++------------------ 2 files changed, 21 insertions(+), 25 deletions(-)
drivers/leds/Kconfig +1 -1
@@ -697,7 +697,7 @@ config LEDS_MENF21BMC config LEDS_IS31FL319X tristate "LED Support for ISSI IS31FL319x I2C LED controller family" - depends on LEDS_CLASS && I2C && OF + depends on LEDS_CLASS && I2C select REGMAP_I2C help This option enables support for LEDs connected to ISSI IS31FL319x
drivers/leds/leds-is31fl319x.c +20 -24
123 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH 2/5 leds: is31fl319x: Make use of dev_err_probe()
Simplify the error handling in probe function by switching from dev_err() to dev_err_probe().
--- drivers/leds/leds-is31fl319x.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
drivers/leds/leds-is31fl319x.c +13 -20
@@ -396,11 +396,9 @@ static int is31fl319x_parse_fw(struct device *dev, struct is31fl319x_chip *is31)int ret; is31->shutdown_gpio =devm_gpiod_get_optional (dev,"shutdown" ,GPIOD_OUT_HIGH ); -if (IS_ERR (is31->shutdown_gpio)) { - ret =PTR_ERR (is31->shutdown_gpio); -dev_err (dev,"Failed to get shutdown gpio: %d\n" , ret); -return ret; - } +if (IS_ERR (is31->shutdown_gpio)) +return dev_err_probe (dev,PTR_ERR (is31->shutdown_gpio), +"Failed to get shutdown gpio\n" ); is31->cdef =device_get_match_data (dev);
@@ -410,11 +408,10 @@ static int is31fl319x_parse_fw(struct device *dev, struct is31fl319x_chip *is31)dev_dbg (dev,"probing with %d leds defined in DT\n" , count); -if (!count || count > is31->cdef->num_leds) { -dev_err (dev,"Number of leds defined must be between 1 and %u\n" , - is31->cdef->num_leds); -return -ENODEV ; - } +if (!count || count > is31->cdef->num_leds) +return dev_err_probe (dev, -ENODEV , +"Number of leds defined must be between 1 and %u\n" , + is31->cdef->num_leds);fwnode_for_each_available_child_node (fwnode, child) {struct is31fl319x_led *led;
@@ -422,27 +419,25 @@ static int is31fl319x_parse_fw(struct device *dev, struct is31fl319x_chip *is31) ret =fwnode_property_read_u32 (child,"reg" , ®);if (ret) { -dev_err (dev,"Failed to read led 'reg' property\n" ); + ret =dev_err_probe (dev, ret,"Failed to read led 'reg' property\n" ); goto put_child_node; }if (reg <1 || reg > is31->cdef->num_leds) { -dev_err (dev,"invalid led reg %u\n" , reg); - ret = -EINVAL ; + ret =dev_err_probe (dev, -EINVAL ,"invalid led reg %u\n" , reg); goto put_child_node; } led = &is31->leds[reg -1 ];if (led->configured) { -dev_err (dev,"led %u is already configured\n" , reg); - ret = -EINVAL ; + ret =dev_err_probe (dev, -EINVAL ,"led %u is already configured\n" , reg); goto put_child_node; } ret =is31fl319x_parse_child_fw (dev, child, led, is31);if (ret) { -dev_err (dev,"led %u DT parsing failed\n" , reg); + ret =dev_err_probe (dev, ret,"led %u DT parsing failed\n" , reg); goto put_child_node; }
@@ -530,8 +525,7 @@ static int is31fl319x_probe(struct i2c_client *client, is31->client = client; is31->regmap =devm_regmap_init_i2c (client, is31->cdef->is31fl319x_regmap_config);if (IS_ERR (is31->regmap)) { -dev_err (&client->dev,"failed to allocate register map\n" ); - err =PTR_ERR (is31->regmap); + err =dev_err_probe (dev,PTR_ERR (is31->regmap),"failed to allocate register map\n" ); goto free_mutex; }
@@ -540,8 +534,7 @@ static int is31fl319x_probe(struct i2c_client *client,/* check for write-reply from chip (we can't read any registers) */ err =regmap_write (is31->regmap, is31->cdef->reset_reg,0x00 );if (err <0 ) { -dev_err (&client->dev,"no response from chip write: err = %d\n" , err); - err = -EIO ;/* does not answer */ + err =dev_err_probe (dev, err,"no response from chip write\n" ); goto free_mutex; }
Signature · 1 line
2.35.1
PATCH 3/5 leds: is31fl319x: Fix devm vs. non-devm ordering
In reply to Andy ShevchenkoWhen non-devm resources are allocated they mustn't be followed by devm allocations, otherwise it will break the tear down ordering and might lead to crashes or other bugs during ->remove() stage. Fix this by wrapping mutex_destroy() call with devm_add_action_or_reset().
--- drivers/leds/leds-is31fl319x.c | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-)
drivers/leds/leds-is31fl319x.c +9 -23
@@ -511,10 +511,13 @@ static int is31fl319x_probe(struct i2c_client *client,return -ENOMEM ;mutex_init (&is31->lock); + err =devm_add_action (dev, (void (*)(void *))mutex_destroy, &is31->lock); +if (err) +return err; err =is31fl319x_parse_fw (&client->dev, is31);if (err) - goto free_mutex; +return err;if (is31->shutdown_gpio) {gpiod_direction_output (is31->shutdown_gpio,0 );
@@ -524,19 +527,15 @@ static int is31fl319x_probe(struct i2c_client *client, is31->client = client; is31->regmap =devm_regmap_init_i2c (client, is31->cdef->is31fl319x_regmap_config); -if (IS_ERR (is31->regmap)) { - err =dev_err_probe (dev,PTR_ERR (is31->regmap),"failed to allocate register map\n" ); - goto free_mutex; - } +if (IS_ERR (is31->regmap)) +return dev_err_probe (dev,PTR_ERR (is31->regmap),"failed to allocate register map\n" );i2c_set_clientdata (client, is31);/* check for write-reply from chip (we can't read any registers) */ err =regmap_write (is31->regmap, is31->cdef->reset_reg,0x00 ); -if (err <0 ) { - err =dev_err_probe (dev, err,"no response from chip write\n" ); - goto free_mutex; - } +if (err <0 ) +return dev_err_probe (dev, err,"no response from chip write\n" );/* * Kernel conventions require per-LED led-max-microamp property.
@@ -568,22 +567,10 @@ static int is31fl319x_probe(struct i2c_client *client, err =devm_led_classdev_register (&client->dev, &led->cdev);if (err <0 ) - goto free_mutex; +return err; }return 0 ; - -free_mutex: -mutex_destroy (&is31->lock); -return err; -} - -static int is31fl319x_remove (struct i2c_client *client) -{ -struct is31fl319x_chip *is31 =i2c_get_clientdata (client); - -mutex_destroy (&is31->lock); -return 0 ; }/*
@@ -611,7 +598,6 @@ static struct i2c_driver is31fl319x_driver = { .of_match_table = of_is31fl319x_match, }, .probe = is31fl319x_probe, - .remove = is31fl319x_remove, .id_table = is31fl319x_id, };
Signature · 1 line
2.35.1
PATCH 4/5 leds: is31fl319x: use simple i2c probe function
In reply to Andy ShevchenkoThe i2c probe functions here don't use the id information provided in their second argument, so the single-parameter i2c probe function ("probe_new") can be used instead.
--- drivers/leds/leds-is31fl319x.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/leds/leds-is31fl319x.c +2 -3
@@ -494,8 +494,7 @@ static inline int is31fl3196_db_to_gain(u32 dezibel)return dezibel /IS31FL3196_AUDIO_GAIN_DB_STEP ; } -static int is31fl319x_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int is31fl319x_probe (struct i2c_client *client) {struct is31fl319x_chip *is31;struct device *dev = &client->dev;
@@ -597,7 +596,7 @@ static struct i2c_driver is31fl319x_driver = { .name = "leds-is31fl319x", .of_match_table = of_is31fl319x_match, }, - .probe = is31fl319x_probe, + .probe_new = is31fl319x_probe, .id_table = is31fl319x_id, };
Signature · 1 line
2.35.1
PATCH 5/5 leds: is31fl319x: sort header inclusion alphabetically
In reply to Andy ShevchenkoSort header inclusion alphabetically.
--- drivers/leds/leds-is31fl319x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/leds/leds-is31fl319x.c +2 -2
@@ -8,7 +8,9 @@* effect LEDs. */ +#include <linux/delay.h> #include <linux/err.h> +#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/leds.h> #include <linux/mod_devicetable.h>
@@ -16,8 +18,6 @@#include <linux/property.h> #include <linux/regmap.h> #include <linux/slab.h> -#include <linux/delay.h> -#include <linux/gpio/consumer.h> /* register numbers */ #define IS31FL319X_SHUTDOWN 0x00
Signature · 1 line
2.35.1