| Message ID | 1347431649-3776-1-git-send-email-sachin.kamat@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Sep 12, 2012 at 2:34 PM, Sachin Kamat <sachin.kamat@linaro.org> wrote: > Fixes the following smatch warnings: > drivers/leds/leds-lm3530.c:361 lm3530_mode_set() info: > why not propagate 'mode' from lm3530_get_mode_from_str() instead of -22? > drivers/leds/leds-lm3530.c:432 lm3530_probe() info: > why not propagate 'err' from lm3530_init_registers() instead of -19? > drivers/leds/leds-lm3530.c:438 lm3530_probe() info: > why not propagate 'err' from led_classdev_register() instead of -19? > Merged, thanks, -Bryan > Reported-by: Fengguang Wu <fengguang.wu@intel.com> > Cc: Shreshtha Kumar SAHU <shreshthakumar.sahu@stericsson.com> > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> > --- > drivers/leds/leds-lm3530.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c > index 1e7ed2a..b26306f 100644 > --- a/drivers/leds/leds-lm3530.c > +++ b/drivers/leds/leds-lm3530.c > @@ -150,7 +150,7 @@ static int lm3530_get_mode_from_str(const char *str) > if (sysfs_streq(str, mode_map[i].mode)) > return mode_map[i].mode_val; > > - return -1; > + return -EINVAL; > } > > static void lm3530_als_configure(struct lm3530_platform_data *pdata, > @@ -358,7 +358,7 @@ static ssize_t lm3530_mode_set(struct device *dev, struct device_attribute > mode = lm3530_get_mode_from_str(buf); > if (mode < 0) { > dev_err(dev, "Invalid mode\n"); > - return -EINVAL; > + return mode; > } > > drvdata->mode = mode; > @@ -429,13 +429,13 @@ static int __devinit lm3530_probe(struct i2c_client *client, > if (err < 0) { > dev_err(&client->dev, > "Register Init failed: %d\n", err); > - return -ENODEV; > + return err; > } > } > err = led_classdev_register(&client->dev, &drvdata->led_dev); > if (err < 0) { > dev_err(&client->dev, "Register led class failed: %d\n", err); > - return -ENODEV; > + return err; > } > > err = device_create_file(drvdata->led_dev.dev, &dev_attr_mode); > -- > 1.7.4.1 >
diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c index 1e7ed2a..b26306f 100644 --- a/drivers/leds/leds-lm3530.c +++ b/drivers/leds/leds-lm3530.c @@ -150,7 +150,7 @@ static int lm3530_get_mode_from_str(const char *str) if (sysfs_streq(str, mode_map[i].mode)) return mode_map[i].mode_val; - return -1; + return -EINVAL; } static void lm3530_als_configure(struct lm3530_platform_data *pdata, @@ -358,7 +358,7 @@ static ssize_t lm3530_mode_set(struct device *dev, struct device_attribute mode = lm3530_get_mode_from_str(buf); if (mode < 0) { dev_err(dev, "Invalid mode\n"); - return -EINVAL; + return mode; } drvdata->mode = mode; @@ -429,13 +429,13 @@ static int __devinit lm3530_probe(struct i2c_client *client, if (err < 0) { dev_err(&client->dev, "Register Init failed: %d\n", err); - return -ENODEV; + return err; } } err = led_classdev_register(&client->dev, &drvdata->led_dev); if (err < 0) { dev_err(&client->dev, "Register led class failed: %d\n", err); - return -ENODEV; + return err; } err = device_create_file(drvdata->led_dev.dev, &dev_attr_mode);
Fixes the following smatch warnings: drivers/leds/leds-lm3530.c:361 lm3530_mode_set() info: why not propagate 'mode' from lm3530_get_mode_from_str() instead of -22? drivers/leds/leds-lm3530.c:432 lm3530_probe() info: why not propagate 'err' from lm3530_init_registers() instead of -19? drivers/leds/leds-lm3530.c:438 lm3530_probe() info: why not propagate 'err' from led_classdev_register() instead of -19? Reported-by: Fengguang Wu <fengguang.wu@intel.com> Cc: Shreshtha Kumar SAHU <shreshthakumar.sahu@stericsson.com> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> --- drivers/leds/leds-lm3530.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)