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-core.c | |
parent | b8a70aef04bf93ba0141008d284ffcdda5883093 (diff) | |
download | linux-stable-92825ff97411f0121166485798cdaf2deb6b5952.tar.gz linux-stable-92825ff97411f0121166485798cdaf2deb6b5952.tar.bz2 linux-stable-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-core.c')
-rw-r--r-- | drivers/iio/industrialio-core.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index acc911a836ca..a85b66081fae 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -692,10 +692,8 @@ int __iio_add_chan_devattr(const char *postfix, struct iio_dev_attr *iio_attr, *t; iio_attr = kzalloc(sizeof(*iio_attr), GFP_KERNEL); - if (iio_attr == NULL) { - ret = -ENOMEM; - goto error_ret; - } + if (iio_attr == NULL) + return -ENOMEM; ret = __iio_device_attr_init(&iio_attr->dev_attr, postfix, chan, readfunc, writefunc, shared_by); @@ -720,7 +718,6 @@ error_device_attr_deinit: __iio_device_attr_deinit(&iio_attr->dev_attr); error_iio_dev_attr_free: kfree(iio_attr); -error_ret: return ret; } @@ -1134,7 +1131,7 @@ int iio_device_register(struct iio_dev *indio_dev) if (ret) { dev_err(indio_dev->dev.parent, "Failed to register debugfs interfaces\n"); - goto error_ret; + return ret; } ret = iio_device_register_sysfs(indio_dev); if (ret) { @@ -1175,7 +1172,6 @@ error_free_sysfs: iio_device_unregister_sysfs(indio_dev); error_unreg_debugfs: iio_device_unregister_debugfs(indio_dev); -error_ret: return ret; } EXPORT_SYMBOL(iio_device_register); |