diff options
author | Tejun Heo <htejun@gmail.com> | 2006-04-11 09:16:45 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 13:12:46 -0400 |
commit | 2bf2cb26b2512c6a609bb152982c388329bedff6 (patch) | |
tree | 9f1f3ea5000304fd946f34b24d9904c2a1027480 /include/linux/libata.h | |
parent | db70fef0750e5f8dbb64f9fadb333d2c7caf26a1 (diff) |
[PATCH] libata: kill @verbose from ata_reset_fn_t
@verbose was added to ata_reset_fn_t because AHCI complained during
probing if no device was attached to the port. However, muting
failure message isn't the correct approach. Reset methods are
responsible for detecting no device condition and finishing
successfully. Now that AHCI softreset is fixed, kill @verbose.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r-- | include/linux/libata.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index fe0a1dcc76c2..d5fd5c06e755 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -252,7 +252,7 @@ struct ata_queued_cmd; | |||
252 | /* typedefs */ | 252 | /* typedefs */ |
253 | typedef void (*ata_qc_cb_t) (struct ata_queued_cmd *qc); | 253 | typedef void (*ata_qc_cb_t) (struct ata_queued_cmd *qc); |
254 | typedef void (*ata_probeinit_fn_t)(struct ata_port *); | 254 | typedef void (*ata_probeinit_fn_t)(struct ata_port *); |
255 | typedef int (*ata_reset_fn_t)(struct ata_port *, int, unsigned int *); | 255 | typedef int (*ata_reset_fn_t)(struct ata_port *, unsigned int *); |
256 | typedef void (*ata_postreset_fn_t)(struct ata_port *ap, unsigned int *); | 256 | typedef void (*ata_postreset_fn_t)(struct ata_port *ap, unsigned int *); |
257 | 257 | ||
258 | struct ata_ioports { | 258 | struct ata_ioports { |
@@ -509,10 +509,8 @@ extern int ata_drive_probe_reset(struct ata_port *ap, | |||
509 | ata_reset_fn_t softreset, ata_reset_fn_t hardreset, | 509 | ata_reset_fn_t softreset, ata_reset_fn_t hardreset, |
510 | ata_postreset_fn_t postreset, unsigned int *classes); | 510 | ata_postreset_fn_t postreset, unsigned int *classes); |
511 | extern void ata_std_probeinit(struct ata_port *ap); | 511 | extern void ata_std_probeinit(struct ata_port *ap); |
512 | extern int ata_std_softreset(struct ata_port *ap, int verbose, | 512 | extern int ata_std_softreset(struct ata_port *ap, unsigned int *classes); |
513 | unsigned int *classes); | 513 | extern int sata_std_hardreset(struct ata_port *ap, unsigned int *class); |
514 | extern int sata_std_hardreset(struct ata_port *ap, int verbose, | ||
515 | unsigned int *class); | ||
516 | extern void ata_std_postreset(struct ata_port *ap, unsigned int *classes); | 514 | extern void ata_std_postreset(struct ata_port *ap, unsigned int *classes); |
517 | extern int ata_dev_revalidate(struct ata_port *ap, struct ata_device *dev, | 515 | extern int ata_dev_revalidate(struct ata_port *ap, struct ata_device *dev, |
518 | int post_reset); | 516 | int post_reset); |