aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sata_sil24.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-04-11 09:16:45 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-11 13:12:46 -0400
commit2bf2cb26b2512c6a609bb152982c388329bedff6 (patch)
tree9f1f3ea5000304fd946f34b24d9904c2a1027480 /drivers/scsi/sata_sil24.c
parentdb70fef0750e5f8dbb64f9fadb333d2c7caf26a1 (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 'drivers/scsi/sata_sil24.c')
-rw-r--r--drivers/scsi/sata_sil24.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index 9aa7493ea146..26d84e094b1d 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -426,8 +426,7 @@ static void sil24_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
426 *tf = pp->tf; 426 *tf = pp->tf;
427} 427}
428 428
429static int sil24_softreset(struct ata_port *ap, int verbose, 429static int sil24_softreset(struct ata_port *ap, unsigned int *class)
430 unsigned int *class)
431{ 430{
432 void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr; 431 void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr;
433 struct sil24_port_priv *pp = ap->private_data; 432 struct sil24_port_priv *pp = ap->private_data;
@@ -489,13 +488,12 @@ static int sil24_softreset(struct ata_port *ap, int verbose,
489 return 0; 488 return 0;
490} 489}
491 490
492static int sil24_hardreset(struct ata_port *ap, int verbose, 491static int sil24_hardreset(struct ata_port *ap, unsigned int *class)
493 unsigned int *class)
494{ 492{
495 unsigned int dummy_class; 493 unsigned int dummy_class;
496 494
497 /* sil24 doesn't report device signature after hard reset */ 495 /* sil24 doesn't report device signature after hard reset */
498 return sata_std_hardreset(ap, verbose, &dummy_class); 496 return sata_std_hardreset(ap, &dummy_class);
499} 497}
500 498
501static int sil24_probe_reset(struct ata_port *ap, unsigned int *classes) 499static int sil24_probe_reset(struct ata_port *ap, unsigned int *classes)