From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752862AbcF2NXo (ORCPT ); Wed, 29 Jun 2016 09:23:44 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:56899 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752537AbcF2NVD (ORCPT ); Wed, 29 Jun 2016 09:21:03 -0400 X-AuditID: cbfee68f-f79476d000001429-1c-5773cb386b7d From: Andi Shyti To: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti Subject: [PATCH 05/15] lirc_dev: simplify goto paths Date: Wed, 29 Jun 2016 22:20:34 +0900 Message-id: <1467206444-9935-6-git-send-email-andi.shyti@samsung.com> X-Mailer: git-send-email 2.8.1 In-reply-to: <1467206444-9935-1-git-send-email-andi.shyti@samsung.com> References: <1467206444-9935-1-git-send-email-andi.shyti@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFLMWRmVeSWpSXmKPExsWyRsSkUNfidHG4wYTFhhbbjzxjtVj84zmT xeVdc9gsejZsZbVY/azCgdXj+pJPzB5b+u+ye/RtWcXo8XmTXABLFJdNSmpOZllqkb5dAlfG 6a1HGQtWiVUcarjO1MDYJdjFyMkhIWAi0TX3DxuELSZx4d56MFtIYAWjxMtfwTA1N7Z/Ze5i 5AKKL2WU+P2ugxXC+cgoMenUd7AONgFNiabbP4BsDg4RAWOJcz/UQcLMAs2MEruvG4HYwkCD Ts75zAxiswioSlza2wJm8wq4SqxedYcVYpmcxOXpD8BGcgq4SSw/f5Md4iBXidan/xlB9koI NLNLLH86mx1ikIDEt8mHWED2SgjISmw6wAwxR1Li4IobLBMYhRcwMqxiFE0tSC4oTkovMtYr TswtLs1L10vOz93ECAzi0/+e9e9gvHvA+hCjAAejEg/vj8PF4UKsiWXFlbmHGE2BNkxklhJN zgfGSl5JvKGxmZGFqYmpsZG5pZmSOO9CqZ/BQgLpiSWp2ampBalF8UWlOanFhxiZODilGhiF zLMk/lW0FXisYTv86ht3ZtvrVYobpplfKb3dNoFFdmpqxMW+zddvvkpvud5lXPsn4lLiCaOH Z5OrTogt6evZ9NlyRrfO869vxD52nbuhEs/0YZbgzVVdBV9Wf/hx5A4jT+Oro6U5Qq9sct7F vlug9XlO26Ie3qeqzX8rrYQePtOLNisM8j6ixFKckWioxVxUnAgAHYsGV10CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprBIsWRmVeSWpSXmKPExsVy+t9jAV2L08XhBjte6VhsP/KM1WLxj+dM Fpd3zWGz6NmwldVi9bMKB1aP60s+MXts6b/L7tG3ZRWjx+dNcgEsUQ2MNhmpiSmpRQqpecn5 KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlAe5UUyhJzSoFCAYnFxUr6dpgm hIa46VrANEbo+oYEwfUYGaCBhDWMGae3HmUsWCVWcajhOlMDY5dgFyMnh4SAicSN7V+ZIWwx iQv31rN1MXJxCAksZZT4/a6DFcL5yCgx6dR3NpAqNgFNiabbP4BsDg4RAWOJcz/UQcLMAs2M EruvG4HYwkBDT875DDaURUBV4tLeFjCbV8BVYvWqO6wQy+QkLk9/ADaSU8BNYvn5m+wgthBQ TevT/4wTGHkXMDKsYpRILUguKE5KzzXKSy3XK07MLS7NS9dLzs/dxAiOlWfSOxgP73I/xCjA wajEw2txoShciDWxrLgy9xCjBAezkgiv3InicCHelMTKqtSi/Pii0pzU4kOMpkCHTWSWEk3O B8ZxXkm8obGJmZGlkbmhhZGxuZI47+P/68KEBNITS1KzU1MLUotg+pg4OKUaGI2WhdrlrbuS L/VuXtBtt7V2Z/8VJzxT/rRRQe/1IUtXvrboOEeLHe4TnT2Tl5dyab8L23HYQZ+53TisvU2l viPUwizrk5mHC9/yG0/vN684W244oVYh5+iBnk2G35fGtl2o0JbVn37zolgRr+7ks5d15JP3 TGafsWixYfK52Sue1U+8Kix2QImlOCPRUIu5qDgRACa5Z3irAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The code can be rearranged so that some goto paths can be removed Signed-off-by: Andi Shyti --- drivers/media/rc/lirc_dev.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c index b11ab5c..400ab80 100644 --- a/drivers/media/rc/lirc_dev.c +++ b/drivers/media/rc/lirc_dev.c @@ -241,52 +241,44 @@ static int lirc_allocate_driver(struct lirc_driver *d) if (!d) { pr_err("lirc_dev: driver pointer must be not NULL!\n"); - err = -EBADRQC; - goto out; + return -EBADRQC; } if (!d->dev) { pr_err("%s: dev pointer not filled in!\n", __func__); - err = -EINVAL; - goto out; + return -EINVAL; } if (MAX_IRCTL_DEVICES <= d->minor) { dev_err(d->dev, "minor must be between 0 and %d!\n", MAX_IRCTL_DEVICES - 1); - err = -EBADRQC; - goto out; + return -EBADRQC; } if (1 > d->code_length || (BUFLEN * 8) < d->code_length) { dev_err(d->dev, "code length must be less than %d bits\n", BUFLEN * 8); - err = -EBADRQC; - goto out; + return -EBADRQC; } if (d->sample_rate) { if (2 > d->sample_rate || HZ < d->sample_rate) { dev_err(d->dev, "invalid %d sample rate\n", d->sample_rate); - err = -EBADRQC; - goto out; + return -EBADRQC; } if (!d->add_to_buf) { dev_err(d->dev, "add_to_buf not set\n"); - err = -EBADRQC; - goto out; + return -EBADRQC; } } else if (!(d->fops && d->fops->read) && !d->rbuf) { dev_err(d->dev, "fops->read and rbuf are NULL!\n"); - err = -EBADRQC; - goto out; + return -EBADRQC; } else if (!d->rbuf) { if (!(d->fops && d->fops->read && d->fops->poll && d->fops->unlocked_ioctl)) { dev_err(d->dev, "undefined read, poll, ioctl\n"); - err = -EBADRQC; - goto out; + return -EBADRQC; } } @@ -364,7 +356,7 @@ out_sysfs: device_destroy(lirc_class, MKDEV(MAJOR(lirc_base_dev), ir->d.minor)); out_lock: mutex_unlock(&lirc_dev_lock); -out: + return err; } @@ -793,9 +785,8 @@ static int __init lirc_dev_init(void) lirc_class = class_create(THIS_MODULE, "lirc"); if (IS_ERR(lirc_class)) { - retval = PTR_ERR(lirc_class); pr_err("lirc_dev: class_create failed\n"); - goto error; + return PTR_ERR(lirc_class); } retval = alloc_chrdev_region(&lirc_base_dev, 0, MAX_IRCTL_DEVICES, @@ -803,15 +794,14 @@ static int __init lirc_dev_init(void) if (retval) { class_destroy(lirc_class); pr_err("lirc_dev: alloc_chrdev_region failed\n"); - goto error; + return retval; } pr_info("lirc_dev: IR Remote Control driver registered, major %d\n", MAJOR(lirc_base_dev)); -error: - return retval; + return 0; } -- 2.8.1