| Message ID | 20221024105250.873394-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [-next] iio: trigger: sysfs: rename error label in iio_sysfs_trigger_probe() | expand |
On Mon, 24 Oct 2022 18:52:50 +0800 Yang Yingliang <yangyingliang@huawei.com> wrote: > Rename error label in iio_sysfs_trigger_probe() to make more readable. > > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Nice Applied to the togreg branch of iio.git and pushed out as testing to let the autobuilders see if they can find anything we missed. Thanks, Jonathan > --- > drivers/iio/trigger/iio-trig-sysfs.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/iio/trigger/iio-trig-sysfs.c b/drivers/iio/trigger/iio-trig-sysfs.c > index d6c5e9644738..63ce01ac2036 100644 > --- a/drivers/iio/trigger/iio-trig-sysfs.c > +++ b/drivers/iio/trigger/iio-trig-sysfs.c > @@ -138,18 +138,18 @@ static int iio_sysfs_trigger_probe(int id) > } > if (foundit) { > ret = -EINVAL; > - goto out1; > + goto err_unlock; > } > t = kmalloc(sizeof(*t), GFP_KERNEL); > if (t == NULL) { > ret = -ENOMEM; > - goto out1; > + goto err_unlock; > } > t->id = id; > t->trig = iio_trigger_alloc(&iio_sysfs_trig_dev, "sysfstrig%d", id); > if (!t->trig) { > ret = -ENOMEM; > - goto free_t; > + goto err_free_sys_trig; > } > > t->trig->dev.groups = iio_sysfs_trigger_attr_groups; > @@ -159,17 +159,17 @@ static int iio_sysfs_trigger_probe(int id) > > ret = iio_trigger_register(t->trig); > if (ret) > - goto out2; > + goto err_free_trig; > list_add(&t->l, &iio_sysfs_trig_list); > __module_get(THIS_MODULE); > mutex_unlock(&iio_sysfs_trig_list_mut); > return 0; > > -out2: > +err_free_trig: > iio_trigger_free(t->trig); > -free_t: > +err_free_sys_trig: > kfree(t); > -out1: > +err_unlock: > mutex_unlock(&iio_sysfs_trig_list_mut); > return ret; > }
diff --git a/drivers/iio/trigger/iio-trig-sysfs.c b/drivers/iio/trigger/iio-trig-sysfs.c index d6c5e9644738..63ce01ac2036 100644 --- a/drivers/iio/trigger/iio-trig-sysfs.c +++ b/drivers/iio/trigger/iio-trig-sysfs.c @@ -138,18 +138,18 @@ static int iio_sysfs_trigger_probe(int id) } if (foundit) { ret = -EINVAL; - goto out1; + goto err_unlock; } t = kmalloc(sizeof(*t), GFP_KERNEL); if (t == NULL) { ret = -ENOMEM; - goto out1; + goto err_unlock; } t->id = id; t->trig = iio_trigger_alloc(&iio_sysfs_trig_dev, "sysfstrig%d", id); if (!t->trig) { ret = -ENOMEM; - goto free_t; + goto err_free_sys_trig; } t->trig->dev.groups = iio_sysfs_trigger_attr_groups; @@ -159,17 +159,17 @@ static int iio_sysfs_trigger_probe(int id) ret = iio_trigger_register(t->trig); if (ret) - goto out2; + goto err_free_trig; list_add(&t->l, &iio_sysfs_trig_list); __module_get(THIS_MODULE); mutex_unlock(&iio_sysfs_trig_list_mut); return 0; -out2: +err_free_trig: iio_trigger_free(t->trig); -free_t: +err_free_sys_trig: kfree(t); -out1: +err_unlock: mutex_unlock(&iio_sysfs_trig_list_mut); return ret; }
Rename error label in iio_sysfs_trigger_probe() to make more readable. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/iio/trigger/iio-trig-sysfs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)