libata: Fix EH merge difference between this branch and upstream.
This commit is contained in:
parent
10a5fd5e6b
commit
381544bba3
|
@ -97,7 +97,7 @@ enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd)
|
|||
* RETURNS:
|
||||
* Zero.
|
||||
*/
|
||||
int ata_scsi_error(struct Scsi_Host *host)
|
||||
void ata_scsi_error(struct Scsi_Host *host)
|
||||
{
|
||||
struct ata_port *ap = (struct ata_port *)&host->hostdata[0];
|
||||
|
||||
|
@ -116,7 +116,6 @@ int ata_scsi_error(struct Scsi_Host *host)
|
|||
scsi_eh_flush_done_q(&ap->eh_done_q);
|
||||
|
||||
DPRINTK("EXIT\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -105,5 +105,6 @@ extern void ata_scsi_rbuf_fill(struct ata_scsi_args *args,
|
|||
|
||||
/* libata-eh.c */
|
||||
extern enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd);
|
||||
extern void ata_scsi_error(struct Scsi_Host *host);
|
||||
|
||||
#endif /* __LIBATA_H__ */
|
||||
|
|
|
@ -637,7 +637,6 @@ extern unsigned long ata_pci_default_filter(const struct ata_port *, struct ata_
|
|||
/*
|
||||
* EH
|
||||
*/
|
||||
extern int ata_scsi_error(struct Scsi_Host *host);
|
||||
extern void ata_eng_timeout(struct ata_port *ap);
|
||||
extern void ata_eh_qc_complete(struct ata_queued_cmd *qc);
|
||||
extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
|
||||
|
|
Loading…
Reference in a new issue