diff options
| -rw-r--r-- | drivers/ata/pata_octeon_cf.c | 18 | ||||
| -rw-r--r-- | drivers/ata/sata_qstor.c | 14 |
2 files changed, 0 insertions, 32 deletions
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c index 3001109352ea..06ddd91ffeda 100644 --- a/drivers/ata/pata_octeon_cf.c +++ b/drivers/ata/pata_octeon_cf.c | |||
| @@ -750,20 +750,6 @@ static void octeon_cf_dev_config(struct ata_device *dev) | |||
| 750 | } | 750 | } |
| 751 | 751 | ||
| 752 | /* | 752 | /* |
| 753 | * Trap if driver tries to do standard bmdma commands. They are not | ||
| 754 | * supported. | ||
| 755 | */ | ||
| 756 | static void unreachable_qc(struct ata_queued_cmd *qc) | ||
| 757 | { | ||
| 758 | BUG(); | ||
| 759 | } | ||
| 760 | |||
| 761 | static u8 unreachable_port(struct ata_port *ap) | ||
| 762 | { | ||
| 763 | BUG(); | ||
| 764 | } | ||
| 765 | |||
| 766 | /* | ||
| 767 | * We don't do ATAPI DMA so return 0. | 753 | * We don't do ATAPI DMA so return 0. |
| 768 | */ | 754 | */ |
| 769 | static int octeon_cf_check_atapi_dma(struct ata_queued_cmd *qc) | 755 | static int octeon_cf_check_atapi_dma(struct ata_queued_cmd *qc) |
| @@ -804,10 +790,6 @@ static struct ata_port_operations octeon_cf_ops = { | |||
| 804 | .sff_dev_select = octeon_cf_dev_select, | 790 | .sff_dev_select = octeon_cf_dev_select, |
| 805 | .sff_irq_on = octeon_cf_irq_on, | 791 | .sff_irq_on = octeon_cf_irq_on, |
| 806 | .sff_irq_clear = octeon_cf_irq_clear, | 792 | .sff_irq_clear = octeon_cf_irq_clear, |
| 807 | .bmdma_setup = unreachable_qc, | ||
| 808 | .bmdma_start = unreachable_qc, | ||
| 809 | .bmdma_stop = unreachable_qc, | ||
| 810 | .bmdma_status = unreachable_port, | ||
| 811 | .cable_detect = ata_cable_40wire, | 793 | .cable_detect = ata_cable_40wire, |
| 812 | .set_piomode = octeon_cf_set_piomode, | 794 | .set_piomode = octeon_cf_set_piomode, |
| 813 | .set_dmamode = octeon_cf_set_dmamode, | 795 | .set_dmamode = octeon_cf_set_dmamode, |
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c index 0074351d7edf..daeebf19a6a9 100644 --- a/drivers/ata/sata_qstor.c +++ b/drivers/ata/sata_qstor.c | |||
| @@ -120,8 +120,6 @@ static void qs_host_stop(struct ata_host *host); | |||
| 120 | static void qs_qc_prep(struct ata_queued_cmd *qc); | 120 | static void qs_qc_prep(struct ata_queued_cmd *qc); |
| 121 | static unsigned int qs_qc_issue(struct ata_queued_cmd *qc); | 121 | static unsigned int qs_qc_issue(struct ata_queued_cmd *qc); |
| 122 | static int qs_check_atapi_dma(struct ata_queued_cmd *qc); | 122 | static int qs_check_atapi_dma(struct ata_queued_cmd *qc); |
| 123 | static void qs_bmdma_stop(struct ata_queued_cmd *qc); | ||
| 124 | static u8 qs_bmdma_status(struct ata_port *ap); | ||
| 125 | static void qs_freeze(struct ata_port *ap); | 123 | static void qs_freeze(struct ata_port *ap); |
| 126 | static void qs_thaw(struct ata_port *ap); | 124 | static void qs_thaw(struct ata_port *ap); |
| 127 | static int qs_prereset(struct ata_link *link, unsigned long deadline); | 125 | static int qs_prereset(struct ata_link *link, unsigned long deadline); |
| @@ -137,8 +135,6 @@ static struct ata_port_operations qs_ata_ops = { | |||
| 137 | .inherits = &ata_sff_port_ops, | 135 | .inherits = &ata_sff_port_ops, |
| 138 | 136 | ||
| 139 | .check_atapi_dma = qs_check_atapi_dma, | 137 | .check_atapi_dma = qs_check_atapi_dma, |
| 140 | .bmdma_stop = qs_bmdma_stop, | ||
| 141 | .bmdma_status = qs_bmdma_status, | ||
| 142 | .qc_prep = qs_qc_prep, | 138 | .qc_prep = qs_qc_prep, |
| 143 | .qc_issue = qs_qc_issue, | 139 | .qc_issue = qs_qc_issue, |
| 144 | 140 | ||
| @@ -190,16 +186,6 @@ static int qs_check_atapi_dma(struct ata_queued_cmd *qc) | |||
| 190 | return 1; /* ATAPI DMA not supported */ | 186 | return 1; /* ATAPI DMA not supported */ |
| 191 | } | 187 | } |
| 192 | 188 | ||
| 193 | static void qs_bmdma_stop(struct ata_queued_cmd *qc) | ||
| 194 | { | ||
| 195 | /* nothing */ | ||
| 196 | } | ||
| 197 | |||
| 198 | static u8 qs_bmdma_status(struct ata_port *ap) | ||
| 199 | { | ||
| 200 | return 0; | ||
| 201 | } | ||
| 202 | |||
| 203 | static inline void qs_enter_reg_mode(struct ata_port *ap) | 189 | static inline void qs_enter_reg_mode(struct ata_port *ap) |
| 204 | { | 190 | { |
| 205 | u8 __iomem *chan = qs_mmio_base(ap->host) + (ap->port_no * 0x4000); | 191 | u8 __iomem *chan = qs_mmio_base(ap->host) + (ap->port_no * 0x4000); |
