leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] libata: convert do_probe_reset() to ata_do_reset()

Browse Source 
Make do_probe_reset() generic by pushing classification check into
ata_drive_probe_reset() and rename it to ata_do_reset().  This will be
used by EH reset.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Tejun Heo 2006-04-01 01:38:17 +09:00 committed by Jeff Garzik
parent 4c360c81a6
commit 9974e7cc6c
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2371,16 +2371,16 @@ int ata_std_probe_reset(struct ata_port *ap, unsigned int *classes)
ata_std_postreset, classes);
}
static int do_probe_reset(struct ata_port *ap, ata_reset_fn_t reset,
ata_postreset_fn_t postreset,
unsigned int *classes)
static int ata_do_reset(struct ata_port *ap,
ata_reset_fn_t reset, ata_postreset_fn_t postreset,
int verbose, unsigned int *classes)
{
int i, rc;
for (i = 0; i < ATA_MAX_DEVICES; i++)
classes[i] = ATA_DEV_UNKNOWN;
rc = reset(ap, 0, classes);
rc = reset(ap, verbose, classes);
if (rc)
return rc;
@ -2400,7 +2400,7 @@ static int do_probe_reset(struct ata_port *ap, ata_reset_fn_t reset,
if (postreset)
postreset(ap, classes);
return classes[0] != ATA_DEV_UNKNOWN ? 0 : -ENODEV;
return 0;
}
/**
@ -2445,21 +2445,24 @@ int ata_drive_probe_reset(struct ata_port *ap, ata_probeinit_fn_t probeinit,
probeinit(ap);
if (softreset) {
rc = do_probe_reset(ap, softreset, postreset, classes);
if (rc == 0)
return 0;
rc = ata_do_reset(ap, softreset, postreset, 0, classes);
if (rc == 0 && classes[0] != ATA_DEV_UNKNOWN)
goto done;
}
if (!hardreset)
return rc;
goto done;
rc = do_probe_reset(ap, hardreset, postreset, classes);
if (rc == 0 || rc != -ENODEV)
return rc;
rc = ata_do_reset(ap, hardreset, postreset, 0, classes);
if (rc || classes[0] != ATA_DEV_UNKNOWN)
goto done;
if (softreset)
rc = do_probe_reset(ap, softreset, postreset, classes);
rc = ata_do_reset(ap, softreset, postreset, 0, classes);
done:
if (rc == 0 && classes[0] == ATA_DEV_UNKNOWN)
rc = -ENODEV;
return rc;
}