From patchwork Mon Sep 11 20:00:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9948065 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9DBB56035D for ; Mon, 11 Sep 2017 20:02:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 967B828D38 for ; Mon, 11 Sep 2017 20:02:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A85328D3A; Mon, 11 Sep 2017 20:02:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48DAF28D38 for ; Mon, 11 Sep 2017 20:02:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750994AbdIKUBz (ORCPT ); Mon, 11 Sep 2017 16:01:55 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:65509 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750782AbdIKUBy (ORCPT ); Mon, 11 Sep 2017 16:01:54 -0400 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0M2pyk-1dY2nb22eU-00sibp; Mon, 11 Sep 2017 22:01:17 +0200 From: Arnd Bergmann To: Russell King , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Arnd Bergmann , Johannes Thumshirn , Hannes Reinecke , linux-arm-kernel@lists.infradead.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: acornscsi: fix build error Date: Mon, 11 Sep 2017 22:00:57 +0200 Message-Id: <20170911200115.3119398-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:YgdBwvUfpWZn2KKOdr4fdjzU+tC0f/orB+/McMUzVuvFmGBG9bF sts8OaO+CekMCXtvJHU+yMQpL7/zlFFuPmSi9wxd3z2As05ae72AjMPWyg581ydY0wcFqZW 9pzq9amay1lc5t++muWqVJTcVHYuVy3QVUhjn+AZeG3oG0hbdD4yp0/AuTiUscSYV8UYYZL 0LztwpPFaL3lAmqzbkfsQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:uwPni8ZpXuY=:6bFfYsQhLr/vdcFTbKBKI9 em9uLB/prKvNxGuq1FLwPMYCkyXoXXd6we4ArzcwFVI8vlfrDcGL8dp0XzYk7NKU6ybq7n5Se 0psm8vQDj8w/9T71YYEwBwPPefxaWCIU0c/NGkWeZlquZkMWlQuNREoqaXxJVo8zlO9LVY64y URIQxUZyLubY0APXRgjTQjJAIvybmgZ9Py2/QDd/ZOIs0wn/RXa0M17ls4y6uR5eM/cso4qyK veq4BVcuTnk3nUIjZ9kUEpT8X1L+v0GkVC1e0uwERKXA6WymCEAyJALJ0GkSLyz49TP7SO3BF 5QguEZhf9ywoiHLwBRQQdC37FuLwm47spo0QQYkYDZVFrzQVX9E2lpRTzQWwH5F9JAH6WYjrI 2Ihf4Y7fi7YSturHMpBiZF6ga3embBvmkUUExMJiv4BfWpckdyNbajPwdrAXTmXKgrmVKcE0t sN9vocsmcPn7dKUVIZv4PcVgi0uULePyScmq4liNI5fGoCfI/gidq/NNxU/kGx2YQuFM3w/kt buHRTbJBABaDnSAz/lKbTXPMMABodBiKyPqNRB8Iv5S/iVH7M5hVzxBOKvxCPhl/V7QbiQyQy k3JyKh0ii8x1lVjiGJJ4NdNZ3PBg8HpRm4rIQd9q5RZaLokj7d7kkFPBhwBPpG9mpenjEErsq ar7aGLOm+VaatPHb6Bhn/8NuQR2hY9JEjjruIELeQZqyK+0Yzr9x1dYUUJWP1bSHqLGY2rM/m Ssl/FKCSPezjDh/t3deUVtyI1x1PkGKNDo7pkw== Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A cleanup patch introduced a fatal typo from inbalanced curly braces: drivers/scsi/arm/acornscsi.c: In function 'acornscsi_host_reset': drivers/scsi/arm/acornscsi.c:2773:1: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] drivers/scsi/arm/acornscsi.c:2795:12: error: invalid storage class for function 'acornscsi_show_info' static int acornscsi_show_info(struct seq_file *m, struct Scsi_Host *instance) The same patch incorrectly changed the argument type of the reset handler, as shown by this warning: drivers/scsi/arm/acornscsi.c:2888:27: error: initialization of 'int (*)(struct scsi_cmnd *)' from incompatible pointer type 'int (*)(struct Scsi_Host *)' [-Werror=incompatible-pointer-types] .eh_host_reset_handler = acornscsi_host_reset, This removes one the extraneous opening brace and reverts the argument type change. Fixes: 74fa80ee3fae ("scsi: acornscsi: move bus reset to host reset") Signed-off-by: Arnd Bergmann Reviewed-by: Johannes Thumshirn --- drivers/scsi/arm/acornscsi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c index 690816f3c6af..8d54283a99b2 100644 --- a/drivers/scsi/arm/acornscsi.c +++ b/drivers/scsi/arm/acornscsi.c @@ -2725,9 +2725,9 @@ int acornscsi_abort(struct scsi_cmnd *SCpnt) * Params : SCpnt - command causing reset * Returns : one of SCSI_RESET_ macros */ -int acornscsi_host_reset(struct Scsi_Host *shpnt) +int acornscsi_host_reset(struct scsi_cmnd *SCpnt) { - AS_Host *host = (AS_Host *)shpnt->hostdata; + AS_Host *host = (AS_Host *)SCpnt->device->host->hostdata; struct scsi_cmnd *SCptr; host->stats.resets += 1; @@ -2741,7 +2741,7 @@ int acornscsi_host_reset(struct Scsi_Host *shpnt) printk(KERN_WARNING "acornscsi_reset: "); print_sbic_status(asr, ssr, host->scsi.phase); - for (devidx = 0; devidx < 9; devidx ++) { + for (devidx = 0; devidx < 9; devidx ++) acornscsi_dumplog(host, devidx); } #endif