From patchwork Mon Dec 10 20:51:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 153348 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3999435ljp; Mon, 10 Dec 2018 12:52:52 -0800 (PST) X-Google-Smtp-Source: AFSGD/UFdCdR8bMIuz6J5OIgjVn9OTsFn6BQNQaoourmPbXHWPHMtYi1nNdxs3fRPnBS4lvW8Ac4 X-Received: by 2002:a63:5b1f:: with SMTP id p31mr12099204pgb.56.1544475171996; Mon, 10 Dec 2018 12:52:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544475171; cv=none; d=google.com; s=arc-20160816; b=MT08sP++SNIyYruSGdaYaLdv4Dcs4bjgfPZ2Lw+eXoWYAyT0sDz1W2zYQ9is10rllo k+votnghivOIgzej+KTnA+6QATGXpiti3jrh1y2pYM0+HgjmmFju7O4eAsuWmles41dc 6XhL28Am6wCxrxiPzTTdCctoXxVMBIJyL6AU++IIhmJRqaQTwCrv3kBcdsDhBSnT3Ub8 RVeE+1yITlnpk9xoARrJ99DephJ7zrLJTLnQzZWsK1SMfCh342StlscqjHy45uKYa916 W65/gRdixmeTVFNMuSAWh5P6S5lTQWroaUEtMEqPjjHK123Aw9NLJyJpnU6NGBwui298 B2vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=9eaNY9Sfi1kvgQFMpyQ59SgPZuJlBbqAWyNj46+nwAg=; b=KDGuPludm/DJH/mKpQ/wKaUGq7Hs1/nIQGEK5juGLlmzwq8p9mJFfFO937W5KtVTpQ 0AZw1P4d4h42N2yPJ/xoR69lG+GyQlybb6NT/EoZBMz7Hpn42zBmhyEv6RPuQyCpnmFe WuU8truEc6i+IN0N8RHGWdD5iY9kKHZ4cunxTbnkBYz7Jb4cZdnGEzhcuotZIrjoDgbK xxpb5XhV/zX7qnQR+c3M4mIWZnoDnr/z4jLzlMVdGYepNd5abqI7+n5hSd/Xj+p1tOb3 q7MJNJaBL+fXbjCMBD6p5XDzY6w4RTXEPmFE65wOBSE1v+vfkk/1aLH/j9ZG2oVd7EuC ZYNg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-scsi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e21si9903189pgg.571.2018.12.10.12.52.51; Mon, 10 Dec 2018 12:52:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-scsi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-scsi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727778AbeLJUwv (ORCPT + 1 other); Mon, 10 Dec 2018 15:52:51 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:33511 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726100AbeLJUwv (ORCPT ); Mon, 10 Dec 2018 15:52:51 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1MLi4W-1gnzQC0PvE-00HbuU; Mon, 10 Dec 2018 21:52:20 +0100 From: Arnd Bergmann To: qla2xxx-upstream@qlogic.com, "James E.J. Bottomley" , "Martin K. Petersen" Cc: Bart Van Assche , Laurence Oberman , Himanshu Madhani , Stephen Rothwell , Arnd Bergmann , Himanshu Madhani , Quinn Tran , Hannes Reinecke , Jens Axboe , Darren Trapp , Bill Kuzeja , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: qla2xxx: fix unused function warning Date: Mon, 10 Dec 2018 21:51:43 +0100 Message-Id: <20181210205215.2703138-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:McxYStCKdDFilTdcSXx15TImaTGWkmXm18OnKWlNfLgZm1Johr+ BN9U0v17D3TyGyUjVjNK2vSOIbjnrWVdE3CikNnTOm5Iy1Tgf+DThIr8QhykN4M5RYLiA2u GsCR058HfWj4KsvOqBeybdgEz7RV6E6Eg7u9uYC6WzL2oZNyeZmSd/PdC0oFqH6Cr9onghy MMmtMf7XG6rPMvgo4GR5Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:kCozPeBj9B4=:Ft1jPuR9NUEGfjaN3ApMN+ N7XJUSaJXucpnow2W/53oyeWA0Bqsa0iC18sYzr/zGR7AWadYrgUWLVbGHAvjn+2cTXpOfitk frsUKmpOwF2TtV+eYM9ZJOtwgRA8TFpqPU7UfYIQw1SIJMnl/VrJYAc6GXgl4MF5hi9NA6EeL G4zokpsJMEMRpMD0Y/xVFpv+NNKRz8PQTxTrTqkKcAsdVh4xJJLnQGOOjLQRnka1mtT4kcNlw s1PnM9lBD9Th3s0jrgGtT0Wl+xsh8IM4y8zUeNHIjCa4WJlSZoETFUVBQEqJ8FBDeQt+CMC1H ySsrUz/llLowIzH3VauWc162tqnwX98OCa8WcfZGkrWodiwSIj+8e+LE+w291wZFtGqt4zKCI C2mjh0+mdxjsEQ5gWcrnpA/E0wsscIJpgA49x9zfC1u08tEUZM9Cj7bcUBOkM2ofh/ok/l64d vac1aQV3qU0ae6ZEXPgz5ji+D+5dxGdyp4v4YniL2TH/CGOs2lw/uCHGpS1h7+ph3SgMQ6Sx9 +4icMJ56N6JjBbtICHefqoXKHtv2yLyQ9dLY8J2jN95LNm19zKFG70fYdVeDDNV328/Ua2pH8 /MvQfKvE3xMWOJNN8CMw0bHTsMMWcU7+iw2Sglwq0HPxrLcPne/6yNbuQLaxCrw4W1/FU82qX BjXBMiC5de5LwDAHBw4+1TUOlmTh9IQEN9QdctCU+/jnLjsL2Rb6Yvtu9h7mzzGFnMugdpDs+ N+nuCPv6TyvHbf9t6j4CKNjbL39fJipet8x/KQ== Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org In what seems to be a mismatch between the scsi-fixes branch and the scsi-mkp/for-next branch, a newly introduced variable from one patch got obsoleted in another one: drivers/scsi/qla2xxx/qla_os.c: In function '__qla2x00_abort_all_cmds': drivers/scsi/qla2xxx/qla_os.c:1791:11: error: unused variable 'status' [-Werror=unused-variable] Remove the variable again. Fixes: c4e521b654e1 ("scsi: qla2xxx: Split the __qla2x00_abort_all_cmds() function") Fixes: f2ffd4e5bc7b ("scsi: qla2xxx: Timeouts occur on surprise removal of QLogic adapter") Signed-off-by: Arnd Bergmann --- Maybe check carefully that the merge in linux-next is otherwise correct --- drivers/scsi/qla2xxx/qla_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.0 diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 63c47bc7ae59..db331cb5ba3c 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -1788,7 +1788,7 @@ static void qla2x00_abort_srb(struct qla_qpair *qp, srb_t *sp, const int res, static void __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res) { - int cnt, status; + int cnt; unsigned long flags; srb_t *sp; scsi_qla_host_t *vha = qp->vha;