Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 381544bb authored by Jeff Garzik's avatar Jeff Garzik
Browse files

libata: Fix EH merge difference between this branch and upstream.

parent 10a5fd5e

drivers/scsi/libata-eh.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

}



/**

drivers/scsi/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -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__ */

include/linux/libata.h

+0 −1
Original line number Diff line number Diff line
@@ -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);