From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752509AbbLKS0T (ORCPT ); Fri, 11 Dec 2015 13:26:19 -0500 Received: from mout.web.de ([212.227.17.12]:61996 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751505AbbLKS0R (ORCPT ); Fri, 11 Dec 2015 13:26:17 -0500 Subject: [PATCH 2/2] z2ram: Delete a jump label in z2_init() To: LKML , Minchan Kim , Nitin Gupta , Sergey Senozhatsky References: <566ABCD9.1060404@users.sourceforge.net> <566B13C1.50907@users.sourceforge.net> Cc: kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <566B1542.7040902@users.sourceforge.net> Date: Fri, 11 Dec 2015 19:26:10 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <566B13C1.50907@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:PTvJRinrrN1IHXsk9OTVIvJZwcSZHrpIEWpudB0j55n3Q6iLuQi RPtmK83FvwD1vJiMq5TdBXD2bvYMR2FmR5uW6my7g+b003Uf8FQDDf5oXr7RSGm4SV1RPgE KashTh6POr4osuF0W49k1sVaus5kBG728jzhVaCOfacGd7lqBxKcrqKWw3g8LfY157aVbkp Zjs5HtXSjJLXAy+TNQ8hA== X-UI-Out-Filterresults: notjunk:1;V01:K0:cKbGLUjY+Bg=:v8FRtxvGYiW4b16zFHHJOX vGpDrjVtDsM0EbeP76LURLtEoG6esLu6ZG8wu9hv/bC6GtfUJvxoTuVzmTxKKGXqNh/aon7/f +LEr91Kw982dIV9psbPymKnzN8AC4lOOdPDeB5Ffq4G3iqBDN/o8T3pQVPYt2BGwDV4v/B0Pg fFKSdELF9LpLSqacSbv1cto7KMvmSmETMhlwo9FFDh4WKdqdx66VdjBJfz0+f2gDmq6IXltSL 2uKjKBfdjhmulGR0YKOQXI9dxikMU5XrMWa9xfAw4/MK5AanTV+YIJ7zOH9PZ9dkRhYY07IVs /imDzWl7PDWb+ZP5tk2LzIgw1G6OZgUmz5TZI+UPOY4eD9vOuExGly8Oj0YHKRAwfpEUaA/YY 00HBZLmT9bcMDnmrzh6iQRKGUOdm2nC1aO6BLry2H/vRrPHqQI2L11mWAxVgQYoH4gcF9Iv9Z kgnUtAIvwtRh+AySfwVMgnC+9pPO0mj4fEh9qJu8C3TnpcUESekXU60Y8aVXdVXftvoy9XlUD fH/mQNJscMe4qZdwF6+teb47dBn4/17dMMxqAhp2V5Y7lmUMgRDFCURt/3vkYgq4iMDhm/N57 8mW1NNErfbelAREBUy08a+QRQvPqSDc5ojzZfrIS7ebPd1tcmJHnmRa5Jlty1jhKNB4yvzrcJ A33pDvCrAc94hXJRaKUywoLFo3ZUDEQrmORjbfUWKiMSmYhm8p4xBiGqvQkV1C2Msa+t304iq fruP0lYyHn4GH+0A+L4SMgoEPTj2dytAb+RDe9FmpuyDuPdId0K0MnzqokEhw79zTLiXA4w06 lhmp7FQ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 11 Dec 2015 18:48:14 +0100 This issue was detected by using the Coccinelle software. * Let us return directly if a call of the function "register_blkdev" failed. * Remove the jump label "err" then. Signed-off-by: Markus Elfring --- drivers/block/z2ram.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index 968f9e5..b07581d 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c @@ -345,9 +345,8 @@ z2_init(void) if (!MACH_IS_AMIGA) return -ENODEV; - ret = -EBUSY; if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME)) - goto err; + return -EBUSY; ret = -ENOMEM; z2ram_gendisk = alloc_disk(1); @@ -374,7 +373,6 @@ out_queue: put_disk(z2ram_gendisk); out_disk: unregister_blkdev(Z2RAM_MAJOR, DEVICE_NAME); -err: return ret; } -- 2.6.3