mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
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: 74fa80ee3f
("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>
This commit is contained in:
parent
b468b6a496
commit
fd53699831
1 changed files with 3 additions and 3 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue