diff options
Diffstat (limited to 'drivers/ata/sata_highbank.c')
| -rw-r--r-- | drivers/ata/sata_highbank.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c index 870b11eadc6d..65965cf5af06 100644 --- a/drivers/ata/sata_highbank.c +++ b/drivers/ata/sata_highbank.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/gfp.h> | 20 | #include <linux/gfp.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/init.h> | ||
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/err.h> | 23 | #include <linux/err.h> |
| 25 | #include <linux/io.h> | 24 | #include <linux/io.h> |
| @@ -142,7 +141,7 @@ static ssize_t ecx_transmit_led_message(struct ata_port *ap, u32 state, | |||
| 142 | ssize_t size) | 141 | ssize_t size) |
| 143 | { | 142 | { |
| 144 | struct ahci_host_priv *hpriv = ap->host->private_data; | 143 | struct ahci_host_priv *hpriv = ap->host->private_data; |
| 145 | struct ecx_plat_data *pdata = (struct ecx_plat_data *) hpriv->plat_data; | 144 | struct ecx_plat_data *pdata = hpriv->plat_data; |
| 146 | struct ahci_port_priv *pp = ap->private_data; | 145 | struct ahci_port_priv *pp = ap->private_data; |
| 147 | unsigned long flags; | 146 | unsigned long flags; |
| 148 | int pmp, i; | 147 | int pmp, i; |
| @@ -403,6 +402,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class, | |||
| 403 | static const unsigned long timing[] = { 5, 100, 500}; | 402 | static const unsigned long timing[] = { 5, 100, 500}; |
| 404 | struct ata_port *ap = link->ap; | 403 | struct ata_port *ap = link->ap; |
| 405 | struct ahci_port_priv *pp = ap->private_data; | 404 | struct ahci_port_priv *pp = ap->private_data; |
| 405 | struct ahci_host_priv *hpriv = ap->host->private_data; | ||
| 406 | u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG; | 406 | u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG; |
| 407 | struct ata_taskfile tf; | 407 | struct ata_taskfile tf; |
| 408 | bool online; | 408 | bool online; |
| @@ -431,7 +431,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class, | |||
| 431 | break; | 431 | break; |
| 432 | } while (!online && retry--); | 432 | } while (!online && retry--); |
| 433 | 433 | ||
| 434 | ahci_start_engine(ap); | 434 | hpriv->start_engine(ap); |
| 435 | 435 | ||
| 436 | if (online) | 436 | if (online) |
| 437 | *class = ahci_dev_classify(ap); | 437 | *class = ahci_dev_classify(ap); |
