diff options
| author |   Hartmut Knaack <knaack.h@gmx.de> | 2014-02-16 11:53:00 +0000 |
|---|---|---|
| committer |   Jonathan Cameron <jic23@kernel.org> | 2014-02-18 08:46:36 +0000 |
| commit | 92825ff97411f0121166485798cdaf2deb6b5952 (patch) | |
| tree | d410f5fb861d7d128e7fa1287f082f3cb7ac7251 /drivers/iio/industrialio-trigger.c | |
| parent | iio:max1363 fix typos of int_vref_mv (diff) | |
| download | wireguard-linux-92825ff97411f0121166485798cdaf2deb6b5952.tar.xz wireguard-linux-92825ff97411f0121166485798cdaf2deb6b5952.zip | |
iio get rid of unneccessary error_ret
Get rid of obsolete uses of goto error_ret and some empty lines.
Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/industrialio-trigger.c')
| -rw-r--r-- | drivers/iio/industrialio-trigger.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c index 766fab24b720..3383b025f62e 100644 --- a/drivers/iio/industrialio-trigger.c +++ b/drivers/iio/industrialio-trigger.c @@ -62,10 +62,9 @@ int iio_trigger_register(struct iio_trigger *trig_info) int ret; trig_info->id = ida_simple_get(&iio_trigger_ida, 0, 0, GFP_KERNEL); - if (trig_info->id < 0) { - ret = trig_info->id; - goto error_ret; - } + if (trig_info->id < 0) + return trig_info->id; + /* Set the name used for the sysfs directory etc */ dev_set_name(&trig_info->dev, "trigger%ld", (unsigned long) trig_info->id); @@ -83,7 +82,6 @@ int iio_trigger_register(struct iio_trigger *trig_info) error_unregister_id: ida_simple_remove(&iio_trigger_ida, trig_info->id); -error_ret: return ret; } EXPORT_SYMBOL(iio_trigger_register); @@ -234,13 +232,12 @@ static int iio_trigger_detach_poll_func(struct iio_trigger *trig, if (trig->ops && trig->ops->set_trigger_state && no_other_users) { ret = trig->ops->set_trigger_state(trig, false); if (ret) - goto error_ret; + return ret; } iio_trigger_put_irq(trig, pf->irq); free_irq(pf->irq, pf); module_put(pf->indio_dev->info->driver_module); -error_ret: return ret; } |