aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ahci.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/ahci.c')
-rw-r--r--drivers/scsi/ahci.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 20fc0846e0be..0e7fb9bf2cd1 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -534,7 +534,7 @@ static int ahci_poll_register(void __iomem *reg, u32 mask, u32 val,
534 return -1; 534 return -1;
535} 535}
536 536
537static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class) 537static int ahci_softreset(struct ata_port *ap, unsigned int *class)
538{ 538{
539 struct ahci_host_priv *hpriv = ap->host_set->private_data; 539 struct ahci_host_priv *hpriv = ap->host_set->private_data;
540 struct ahci_port_priv *pp = ap->private_data; 540 struct ahci_port_priv *pp = ap->private_data;
@@ -646,22 +646,19 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)
646 fail_restart: 646 fail_restart:
647 ahci_start_engine(ap); 647 ahci_start_engine(ap);
648 fail: 648 fail:
649 if (verbose) 649 printk(KERN_ERR "ata%u: softreset failed (%s)\n",
650 printk(KERN_ERR "ata%u: softreset failed (%s)\n", 650 ap->id, reason);
651 ap->id, reason);
652 else
653 DPRINTK("EXIT, rc=%d reason=\"%s\"\n", rc, reason);
654 return rc; 651 return rc;
655} 652}
656 653
657static int ahci_hardreset(struct ata_port *ap, int verbose, unsigned int *class) 654static int ahci_hardreset(struct ata_port *ap, unsigned int *class)
658{ 655{
659 int rc; 656 int rc;
660 657
661 DPRINTK("ENTER\n"); 658 DPRINTK("ENTER\n");
662 659
663 ahci_stop_engine(ap); 660 ahci_stop_engine(ap);
664 rc = sata_std_hardreset(ap, verbose, class); 661 rc = sata_std_hardreset(ap, class);
665 ahci_start_engine(ap); 662 ahci_start_engine(ap);
666 663
667 if (rc == 0) 664 if (rc == 0)