hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iio: light: tsl2563: Use devm_* APIs 

devm_* APIs are device managed and make code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Sachin Kamat 2013-07-30 09:44:00 +01:00 committed by Jonathan Cameron
parent 3d0ccbaff3
commit bace48f44a
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/iio/light/tsl2563.c
View File

@ -702,7 +702,7 @@ static int tsl2563_probe(struct i2c_client *client,
int err = 0; int err = 0;
u8 id = 0; u8 id = 0;
indio_dev = iio_device_alloc(sizeof(*chip)); indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
if (!indio_dev) if (!indio_dev)
return -ENOMEM; return -ENOMEM;
@ -714,13 +714,13 @@ static int tsl2563_probe(struct i2c_client *client,
err = tsl2563_detect(chip); err = tsl2563_detect(chip);
if (err) { if (err) {
dev_err(&client->dev, "detect error %d\n", -err); dev_err(&client->dev, "detect error %d\n", -err);
goto fail1; return err;
} }
err = tsl2563_read_id(chip, &id); err = tsl2563_read_id(chip, &id);
if (err) { if (err) {
dev_err(&client->dev, "read id error %d\n", -err); dev_err(&client->dev, "read id error %d\n", -err);
goto fail1; return err;
} }
mutex_init(&chip->lock); mutex_init(&chip->lock);
@ -751,7 +751,7 @@ static int tsl2563_probe(struct i2c_client *client,
indio_dev->info = &tsl2563_info_no_irq; indio_dev->info = &tsl2563_info_no_irq;
if (client->irq) { if (client->irq) {
err = request_threaded_irq(client->irq, err = devm_request_threaded_irq(&client->dev, client->irq,
NULL, NULL,
&tsl2563_event_handler, &tsl2563_event_handler,
IRQF_TRIGGER_RISING | IRQF_ONESHOT, IRQF_TRIGGER_RISING | IRQF_ONESHOT,
@ -759,14 +759,14 @@ static int tsl2563_probe(struct i2c_client *client,
indio_dev); indio_dev);
if (err) { if (err) {
dev_err(&client->dev, "irq request error %d\n", -err); dev_err(&client->dev, "irq request error %d\n", -err);
goto fail1; return err;
} }
} }
err = tsl2563_configure(chip); err = tsl2563_configure(chip);
if (err) { if (err) {
dev_err(&client->dev, "configure error %d\n", -err); dev_err(&client->dev, "configure error %d\n", -err);
goto fail2; return err;
} }
INIT_DELAYED_WORK(&chip->poweroff_work, tsl2563_poweroff_work); INIT_DELAYED_WORK(&chip->poweroff_work, tsl2563_poweroff_work);
@ -777,19 +777,14 @@ static int tsl2563_probe(struct i2c_client *client,
err = iio_device_register(indio_dev); err = iio_device_register(indio_dev);
if (err) { if (err) {
dev_err(&client->dev, "iio registration error %d\n", -err); dev_err(&client->dev, "iio registration error %d\n", -err);
goto fail3; goto fail;
} }
return 0; return 0;
fail3: fail:
cancel_delayed_work(&chip->poweroff_work); cancel_delayed_work(&chip->poweroff_work);
flush_scheduled_work(); flush_scheduled_work();
fail2:
if (client->irq)
free_irq(client->irq, indio_dev);
fail1:
iio_device_free(indio_dev);
return err; return err;
} }
@ -807,10 +802,6 @@ static int tsl2563_remove(struct i2c_client *client)
chip->intr); chip->intr);
flush_scheduled_work(); flush_scheduled_work();
tsl2563_set_power(chip, 0); tsl2563_set_power(chip, 0);
if (client->irq)
free_irq(client->irq, indio_dev);
iio_device_free(indio_dev);
return 0; return 0;
} }