From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754906AbcIJOaj (ORCPT ); Sat, 10 Sep 2016 10:30:39 -0400 Received: from mout.web.de ([212.227.15.4]:54496 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753252AbcIJOad (ORCPT ); Sat, 10 Sep 2016 10:30:33 -0400 Subject: [PATCH 6/7] cfag12864b: Return an error code only as a constant in cfag12864b_init() To: kernel-janitors@vger.kernel.org, Miguel Ojeda Sandonis References: <566ABCD9.1060404@users.sourceforge.net> <3d24b514-4e99-86ea-d69e-49a0b1edd286@users.sourceforge.net> Cc: LKML , Julia Lawall From: SF Markus Elfring Message-ID: <8a996728-1739-abe6-1475-76f360f26a29@users.sourceforge.net> Date: Sat, 10 Sep 2016 16:30:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <3d24b514-4e99-86ea-d69e-49a0b1edd286@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:PEnHNrUzkzz3v6QT5sUiU2kQQnWff0uj22zagFzaDkWO/SVm9vT dLYnWWpXMNsaKIzd21ZitO5Qfipcm8F8lIDOS8LPlbMfNgUDNlZkr3Xuu8CfY7eAzvPdGHx DrDevWCO6SfUAtgY7uAuuVBUFf884E7ZcsYyI0Mb4b7LcypYRIm71O1OHdIqgkWpruCiNBu 0SaR7hXKrJgu/a/2Pdsig== X-UI-Out-Filterresults: notjunk:1;V01:K0:LrPYb6M9l6k=:ZHvnrjcDD4iHj91WVmnJVb P5jRUM9LGb444Mcb8CPNZKrMY9nDXZknFO/P7t82QM2Y43WVodNs7Vaw+stFpG6KyNBAwUmjk XjlyIEXhRbTIO9sMDRG6Z5VG4nuua4C66rd/LAKKCU20bYJvoDWtv9VK85jVikWZsgyf02YXF IfbpaMHEuiG9s32mmyW8j8+75uAaO6dv6w+09LhlZU3R0auLkhl+bUXr4K8pyCqc8st0iMXmg dCpZnQl83fZp8piTqbOt98Ur8gtJnUrnAmxUJj01zokcOhfhog3lhCT5iDC+R8G+MUPoi45ay vG7DonNvCHOUI4bmCoIgkI/o4l1iNInRdyIACJ4UKuNQwNjpEjL28flvDuEW6X1D6LTZOJqBz IvZKbsH+BCIXcZg+4VoxdeCF5I2R8OeWzaZUZSWzaZ/GpfVF++IUfCPxnrFq0WJsBC8LmuSOy a5/xLUlQAMtoGniKKZQstjOxf2KRjEs9fFPgXlKwSKIgi2jypO/8wrr3Bw0a+X4ekVSgJU2mp e6GuAwqckp9j99bICFhBCECiKXROUWfAHxLucFkLNNH8bMcp4q+7gl9bYtzziWlK5QD9GyA3e XWam4KP5pcpLzZQkSZnnzHzdM81dN7esRlFV+7QsGKK9Kfp8oEOdTreLSkTHgipqlWJbvsGG1 01lDFSLPtGP2brtO/BVF7mCZzyDFWn/tdrQSPiuv0/vFBDXnP+rwOMiYik/+vbUD9lMoR9lQ7 5cXOuGHLWCWUlEMvUTPFExXOL9Ey+UC3xBeGH+NOg8EGYEdXWOA5cMpdtUfSSE0hbKSmF/Uz6 ItXeY9Q Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 10 Sep 2016 15:50:25 +0200 1. Return an error code without storing it in a local variable. 2. Do not use curly brackets at one source code place where a single statement should be sufficient. 3. Delete the local variable "ret" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- drivers/auxdisplay/cfag12864b.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/auxdisplay/cfag12864b.c b/drivers/auxdisplay/cfag12864b.c index b471b28..b2533e2 100644 --- a/drivers/auxdisplay/cfag12864b.c +++ b/drivers/auxdisplay/cfag12864b.c @@ -329,8 +329,6 @@ EXPORT_SYMBOL_GPL(cfag12864b_isinited); static int __init cfag12864b_init(void) { - int ret; - /* ks0108_init() must be called first */ if (!ks0108_isinited()) { printk(KERN_ERR CFAG12864B_NAME ": ERROR: " @@ -349,10 +347,8 @@ static int __init cfag12864b_init(void) cfag12864b_cache = kmalloc_array(CFAG12864B_SIZE, sizeof(*cfag12864b_cache), GFP_KERNEL); - if (cfag12864b_cache == NULL) { - ret = -ENOMEM; + if (!cfag12864b_cache) goto free_buffer; - } cfag12864b_workqueue = create_singlethread_workqueue(CFAG12864B_NAME); if (cfag12864b_workqueue == NULL) @@ -367,7 +363,7 @@ static int __init cfag12864b_init(void) kfree(cfag12864b_cache); free_buffer: free_page((unsigned long) cfag12864b_buffer); - return ret; + return -ENOMEM; } static void __exit cfag12864b_exit(void) -- 2.10.0