p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] lirc_dev: simplify goto paths 

The code can be rearranged so that some goto paths can be removed

Signed-off-by: Andi Shyti <andi.shyti@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Andi Shyti 2016-07-06 06:01:17 -03:00 committed by Mauro Carvalho Chehab
parent 3fac031460
commit 54fcecafe5
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/media/rc/lirc_dev.c
View File

@ -243,52 +243,44 @@ static int lirc_allocate_driver(struct lirc_driver *d)
if (!d) { if (!d) {
pr_err("driver pointer must be not NULL!\n"); pr_err("driver pointer must be not NULL!\n");
err = -EBADRQC; return -EBADRQC;
goto out;
} }
if (!d->dev) { if (!d->dev) {
pr_err("dev pointer not filled in!\n"); pr_err("dev pointer not filled in!\n");
err = -EINVAL; return -EINVAL;
goto out;
} }
if (MAX_IRCTL_DEVICES <= d->minor) { if (MAX_IRCTL_DEVICES <= d->minor) {
dev_err(d->dev, "minor must be between 0 and %d!\n", dev_err(d->dev, "minor must be between 0 and %d!\n",
MAX_IRCTL_DEVICES - 1); MAX_IRCTL_DEVICES - 1);
err = -EBADRQC; return -EBADRQC;
goto out;
} }
if (1 > d->code_length || (BUFLEN * 8) < d->code_length) { if (1 > d->code_length || (BUFLEN * 8) < d->code_length) {
dev_err(d->dev, "code length must be less than %d bits\n", dev_err(d->dev, "code length must be less than %d bits\n",
BUFLEN * 8); BUFLEN * 8);
err = -EBADRQC; return -EBADRQC;
goto out;
} }
if (d->sample_rate) { if (d->sample_rate) {
if (2 > d->sample_rate || HZ < d->sample_rate) { if (2 > d->sample_rate || HZ < d->sample_rate) {
dev_err(d->dev, "invalid %d sample rate\n", dev_err(d->dev, "invalid %d sample rate\n",
d->sample_rate); d->sample_rate);
err = -EBADRQC; return -EBADRQC;
goto out;
} }
if (!d->add_to_buf) { if (!d->add_to_buf) {
dev_err(d->dev, "add_to_buf not set\n"); dev_err(d->dev, "add_to_buf not set\n");
err = -EBADRQC; return -EBADRQC;
goto out;
} }
} else if (!(d->fops && d->fops->read) && !d->rbuf) { } else if (!(d->fops && d->fops->read) && !d->rbuf) {
dev_err(d->dev, "fops->read and rbuf are NULL!\n"); dev_err(d->dev, "fops->read and rbuf are NULL!\n");
err = -EBADRQC; return -EBADRQC;
goto out;
} else if (!d->rbuf) { } else if (!d->rbuf) {
if (!(d->fops && d->fops->read && d->fops->poll && if (!(d->fops && d->fops->read && d->fops->poll &&
d->fops->unlocked_ioctl)) { d->fops->unlocked_ioctl)) {
dev_err(d->dev, "undefined read, poll, ioctl\n"); dev_err(d->dev, "undefined read, poll, ioctl\n");
err = -EBADRQC; return -EBADRQC;
goto out;
} }
} }
@ -366,7 +358,7 @@ static int lirc_allocate_driver(struct lirc_driver *d)
device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor)); device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor));
out_lock: out_lock:
mutex_unlock(&lirc_dev_lock); mutex_unlock(&lirc_dev_lock);
out:
return err; return err;
} }
@ -790,9 +782,8 @@ static int __init lirc_dev_init(void)
lirc_class = class_create(THIS_MODULE, "lirc"); lirc_class = class_create(THIS_MODULE, "lirc");
if (IS_ERR(lirc_class)) { if (IS_ERR(lirc_class)) {
retval = PTR_ERR(lirc_class);
pr_err("class_create failed\n"); pr_err("class_create failed\n");
goto error; return PTR_ERR(lirc_class);
} }
retval = alloc_chrdev_region(&lirc_base_dev, 0, MAX_IRCTL_DEVICES, retval = alloc_chrdev_region(&lirc_base_dev, 0, MAX_IRCTL_DEVICES,
@ -800,15 +791,14 @@ static int __init lirc_dev_init(void)
if (retval) { if (retval) {
class_destroy(lirc_class); class_destroy(lirc_class);
pr_err("alloc_chrdev_region failed\n"); pr_err("alloc_chrdev_region failed\n");
goto error; return retval;
} }
pr_info("IR Remote Control driver registered, major %d\n", pr_info("IR Remote Control driver registered, major %d\n",
MAJOR(lirc_base_dev)); MAJOR(lirc_base_dev));
error: return 0;
return retval;
} }