From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3CF2C49EAD for ; Tue, 5 Nov 2019 09:28:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8778521D7C for ; Tue, 5 Nov 2019 09:28:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="GX5X3lUm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388508AbfKEJ2s (ORCPT ); Tue, 5 Nov 2019 04:28:48 -0500 Received: from mail-vs1-f68.google.com ([209.85.217.68]:35752 "EHLO mail-vs1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388499AbfKEJ2s (ORCPT ); Tue, 5 Nov 2019 04:28:48 -0500 Received: by mail-vs1-f68.google.com with SMTP id k15so12985264vsp.2 for ; Tue, 05 Nov 2019 01:28:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Q5/7s98PhC6jxZLJVmCHmR13iFo5P8VlHAp+JLns2BA=; b=GX5X3lUmaa27neYrHSlFgvaDCVsuKz/zKucQz8VNcC098H9XmWKI7OFY/WbmbEh1CC fEQIldAz+Q7MpE1bwuhsGjiuiXHchytXBPJc1l65BFH4Djj36gXxuelWVFBkFdc6oCeH d2Il/QdnLcun0JKe4t0Y8XUZIyAAisSSZDQyI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Q5/7s98PhC6jxZLJVmCHmR13iFo5P8VlHAp+JLns2BA=; b=LKeuTXIpMVIUzOAuY0pn5RBIOHH8n/TELrJtibrVaJpSM2CVe2empsshsceLqaprtW vJ1zYeOQwpLXgRillkDu8s2agENRGvndFSFA9GgBVve41frSCdcuNHLQ4rvbkM5BBAW+ awwPyYhRxMFLgsvR2J2FRBPqY5yePHo3T5cJ+QH7RIlGyUVbwa2qRLCO1KTUgrYf8w0o A8MekIwDHT1wjo18geraVCC31YVqJ4vOT8nbBYo0MU08Ya+QzxS+KXmvMdZGXCCBEzop AA6WOm/3QKf86u0LXSsRVLCDowjF04g/VvcrF1LWjnwk7ObT19ejuWF4lCRccDjB8ajR rOFw== X-Gm-Message-State: APjAAAVvRQe+QZ59c3CBbMWXalJQ/oVjoD/VyueEx0SOicUKgI1Il9ar lNPfHO1M/SYAzm/9VQKX57WGYVizsUNYTQlMSY6LNQ== X-Google-Smtp-Source: APXvYqzcC4WZuFL9Q+uUY8ZxtbmZjlncd9HmkUg6UwU2E06KR+lY3eX/ogNGlaNjf9cIke6TqFQSGDhqa/Z34PxYQiQ= X-Received: by 2002:a67:b917:: with SMTP id q23mr7153086vsn.205.1572946127039; Tue, 05 Nov 2019 01:28:47 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Sumit Saxena Date: Tue, 5 Nov 2019 14:58:35 +0530 Message-ID: Subject: Re: [PATCH] scsi: megaraid_sas: Use common error handling code in megasas_mgmt_ioctl_fw() To: Markus Elfring Cc: Linux SCSI List , "PDL,MEGARAIDLINUX" , "James E. J. Bottomley" , Kashyap Desai , Shivasharan S , "Martin K. Petersen" , LKML , kernel-janitors@vger.kernel.org, Chandrakanth Patil , YueHaibing Content-Type: text/plain; charset="UTF-8" Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org On Fri, Nov 1, 2019 at 3:06 AM Markus Elfring wrote: > > From: Markus Elfring > Date: Thu, 31 Oct 2019 22:23:02 +0100 > > Move the same error code assignments so that such exception handling > can be better reused at the end of this function. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring Acked-by: Sumit Saxena > --- > drivers/scsi/megaraid/megaraid_sas_base.c | 25 ++++++++++------------- > 1 file changed, 11 insertions(+), 14 deletions(-) > > diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c > index c40fbea06cc5..f2f2a240e5af 100644 > --- a/drivers/scsi/megaraid/megaraid_sas_base.c > +++ b/drivers/scsi/megaraid/megaraid_sas_base.c > @@ -8272,27 +8272,20 @@ static int megasas_mgmt_ioctl_fw(struct file *file, unsigned long arg) > return PTR_ERR(ioc); > > instance = megasas_lookup_instance(ioc->host_no); > - if (!instance) { > - error = -ENODEV; > - goto out_kfree_ioc; > - } > + if (!instance) > + goto e_nodev; > > /* Block ioctls in VF mode */ > - if (instance->requestorId && !allow_vf_ioctls) { > - error = -ENODEV; > - goto out_kfree_ioc; > - } > + if (instance->requestorId && !allow_vf_ioctls) > + goto e_nodev; > > if (atomic_read(&instance->adprecovery) == MEGASAS_HW_CRITICAL_ERROR) { > dev_err(&instance->pdev->dev, "Controller in crit error\n"); > - error = -ENODEV; > - goto out_kfree_ioc; > + goto e_nodev; > } > > - if (instance->unload == 1) { > - error = -ENODEV; > - goto out_kfree_ioc; > - } > + if (instance->unload == 1) > + goto e_nodev; > > if (down_interruptible(&instance->ioctl_sem)) { > error = -ERESTARTSYS; > @@ -8311,6 +8304,10 @@ static int megasas_mgmt_ioctl_fw(struct file *file, unsigned long arg) > out_kfree_ioc: > kfree(ioc); > return error; > + > +e_nodev: > + error = -ENODEV; > + goto out_kfree_ioc; > } > > static int megasas_mgmt_ioctl_aen(struct file *file, unsigned long arg) > -- > 2.23.0 >