diff options
Diffstat (limited to 'drivers/ata/ahci.c')
-rw-r--r-- | drivers/ata/ahci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index c81d809c111b..a52a5b662f35 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
36 | #include <linux/module.h> | 36 | #include <linux/module.h> |
37 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
38 | #include <linux/init.h> | ||
39 | #include <linux/blkdev.h> | 38 | #include <linux/blkdev.h> |
40 | #include <linux/delay.h> | 39 | #include <linux/delay.h> |
41 | #include <linux/interrupt.h> | 40 | #include <linux/interrupt.h> |
@@ -578,6 +577,7 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, | |||
578 | unsigned long deadline) | 577 | unsigned long deadline) |
579 | { | 578 | { |
580 | struct ata_port *ap = link->ap; | 579 | struct ata_port *ap = link->ap; |
580 | struct ahci_host_priv *hpriv = ap->host->private_data; | ||
581 | bool online; | 581 | bool online; |
582 | int rc; | 582 | int rc; |
583 | 583 | ||
@@ -588,7 +588,7 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, | |||
588 | rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context), | 588 | rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context), |
589 | deadline, &online, NULL); | 589 | deadline, &online, NULL); |
590 | 590 | ||
591 | ahci_start_engine(ap); | 591 | hpriv->start_engine(ap); |
592 | 592 | ||
593 | DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class); | 593 | DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class); |
594 | 594 | ||
@@ -603,6 +603,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, | |||
603 | { | 603 | { |
604 | struct ata_port *ap = link->ap; | 604 | struct ata_port *ap = link->ap; |
605 | struct ahci_port_priv *pp = ap->private_data; | 605 | struct ahci_port_priv *pp = ap->private_data; |
606 | struct ahci_host_priv *hpriv = ap->host->private_data; | ||
606 | u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG; | 607 | u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG; |
607 | struct ata_taskfile tf; | 608 | struct ata_taskfile tf; |
608 | bool online; | 609 | bool online; |
@@ -618,7 +619,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, | |||
618 | rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context), | 619 | rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context), |
619 | deadline, &online, NULL); | 620 | deadline, &online, NULL); |
620 | 621 | ||
621 | ahci_start_engine(ap); | 622 | hpriv->start_engine(ap); |
622 | 623 | ||
623 | /* The pseudo configuration device on SIMG4726 attached to | 624 | /* The pseudo configuration device on SIMG4726 attached to |
624 | * ASUS P5W-DH Deluxe doesn't send signature FIS after | 625 | * ASUS P5W-DH Deluxe doesn't send signature FIS after |