OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] libata: remove postreset handling from ata_do_reset() 

Make ata_do_reset() deal only with reset.  postreset is now the
responsibility of the caller.  This is simpler and eases later
prereset addition.

Signed-off-by: Tejun Heo <htejun@gmail.com>
This commit is contained in:
Tejun Heo 2006-05-15 20:57:38 +09:00
parent 3adcebb2b5
commit 96bd39ec29
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/scsi/libata-core.c
View File

@ -2585,7 +2585,7 @@ int ata_std_probe_reset(struct ata_port *ap, unsigned int *classes)
} }
int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset, int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset,
ata_postreset_fn_t postreset, unsigned int *classes) unsigned int *classes)
{ {
int i, rc; int i, rc;
@ -2609,9 +2609,6 @@ int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset,
if (classes[i] == ATA_DEV_UNKNOWN) if (classes[i] == ATA_DEV_UNKNOWN)
classes[i] = ATA_DEV_NONE; classes[i] = ATA_DEV_NONE;
if (postreset)
postreset(ap, classes);
return 0; return 0;
} }
@ -2655,7 +2652,7 @@ int ata_drive_probe_reset(struct ata_port *ap, ata_probeinit_fn_t probeinit,
probeinit(ap); probeinit(ap);
if (softreset && !sata_set_spd_needed(ap)) { if (softreset && !sata_set_spd_needed(ap)) {
rc = ata_do_reset(ap, softreset, postreset, classes); rc = ata_do_reset(ap, softreset, classes);
if (rc == 0 && classes[0] != ATA_DEV_UNKNOWN) if (rc == 0 && classes[0] != ATA_DEV_UNKNOWN)
goto done; goto done;
printk(KERN_INFO "ata%u: softreset failed, will try " printk(KERN_INFO "ata%u: softreset failed, will try "
@ -2667,7 +2664,7 @@ int ata_drive_probe_reset(struct ata_port *ap, ata_probeinit_fn_t probeinit,
goto done; goto done;
while (1) { while (1) {
rc = ata_do_reset(ap, hardreset, postreset, classes); rc = ata_do_reset(ap, hardreset, classes);
if (rc == 0) { if (rc == 0) {
if (classes[0] != ATA_DEV_UNKNOWN) if (classes[0] != ATA_DEV_UNKNOWN)
goto done; goto done;
@ -2688,12 +2685,16 @@ int ata_drive_probe_reset(struct ata_port *ap, ata_probeinit_fn_t probeinit,
ap->id); ap->id);
ssleep(5); ssleep(5);
rc = ata_do_reset(ap, softreset, postreset, classes); rc = ata_do_reset(ap, softreset, classes);
} }
done: done:
if (rc == 0 && classes[0] == ATA_DEV_UNKNOWN) if (rc == 0) {
rc = -ENODEV; if (postreset)
postreset(ap, classes);
if (classes[0] == ATA_DEV_UNKNOWN)
rc = -ENODEV;
}
return rc; return rc;
} }

2
drivers/scsi/libata.h
View File

@ -57,7 +57,7 @@ extern int ata_down_xfermask_limit(struct ata_port *ap, struct ata_device *dev,
int force_pio0); int force_pio0);
extern int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev); extern int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev);
extern int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset, extern int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset,
ata_postreset_fn_t postreset, unsigned int *classes); unsigned int *classes);
extern void ata_qc_free(struct ata_queued_cmd *qc); extern void ata_qc_free(struct ata_queued_cmd *qc);
extern void ata_qc_issue(struct ata_queued_cmd *qc); extern void ata_qc_issue(struct ata_queued_cmd *qc);
extern int ata_check_atapi_dma(struct ata_queued_cmd *qc); extern int ata_check_atapi_dma(struct ata_queued_cmd *qc);