diff options
Diffstat (limited to 'drivers/scsi/ahci.c')
| -rw-r--r-- | drivers/scsi/ahci.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c index fe8187d6f58b..03829aedfd39 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c | |||
| @@ -192,7 +192,6 @@ static void ahci_port_stop(struct ata_port *ap); | |||
| 192 | static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf); | 192 | static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf); |
| 193 | static void ahci_qc_prep(struct ata_queued_cmd *qc); | 193 | static void ahci_qc_prep(struct ata_queued_cmd *qc); |
| 194 | static u8 ahci_check_status(struct ata_port *ap); | 194 | static u8 ahci_check_status(struct ata_port *ap); |
| 195 | static u8 ahci_check_err(struct ata_port *ap); | ||
| 196 | static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); | 195 | static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); |
| 197 | static void ahci_remove_one (struct pci_dev *pdev); | 196 | static void ahci_remove_one (struct pci_dev *pdev); |
| 198 | 197 | ||
| @@ -221,7 +220,6 @@ static const struct ata_port_operations ahci_ops = { | |||
| 221 | 220 | ||
| 222 | .check_status = ahci_check_status, | 221 | .check_status = ahci_check_status, |
| 223 | .check_altstatus = ahci_check_status, | 222 | .check_altstatus = ahci_check_status, |
| 224 | .check_err = ahci_check_err, | ||
| 225 | .dev_select = ata_noop_dev_select, | 223 | .dev_select = ata_noop_dev_select, |
| 226 | 224 | ||
| 227 | .tf_read = ahci_tf_read, | 225 | .tf_read = ahci_tf_read, |
| @@ -458,13 +456,6 @@ static u8 ahci_check_status(struct ata_port *ap) | |||
| 458 | return readl(mmio + PORT_TFDATA) & 0xFF; | 456 | return readl(mmio + PORT_TFDATA) & 0xFF; |
| 459 | } | 457 | } |
| 460 | 458 | ||
| 461 | static u8 ahci_check_err(struct ata_port *ap) | ||
| 462 | { | ||
| 463 | void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr; | ||
| 464 | |||
| 465 | return (readl(mmio + PORT_TFDATA) >> 8) & 0xFF; | ||
| 466 | } | ||
| 467 | |||
| 468 | static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf) | 459 | static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf) |
| 469 | { | 460 | { |
| 470 | struct ahci_port_priv *pp = ap->private_data; | 461 | struct ahci_port_priv *pp = ap->private_data; |
