]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
scsi: acornscsi: fix build error
authorArnd Bergmann <arnd@arndb.de>
Mon, 11 Sep 2017 20:00:57 +0000 (22:00 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 15 Sep 2017 01:02:03 +0000 (21:02 -0400)
commitfd536998314a9dc54f384fa16287321edb81602a
treef597054c441c939264309b4b5c7e8b11e605e24f
parentb468b6a4969f9bdddb31d484f151bfa03fbee767
scsi: acornscsi: fix build error

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.

[mkp: fixed checkpatch complaint]

Fixes: 74fa80ee3fae ("scsi: acornscsi: move bus reset to host reset")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/arm/acornscsi.c