Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit d6b0de8c28ef32d081cfee938e443ce2a2429cfe

Authored by Tejun Heo
Committed by Jeff Garzik
1 parent 1c5afdf7a6
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

libata-sff: kill dummy BMDMA ops from sata_qstor and pata_octeon_cf 

Now that SFF and BMDMA are completely separate, sata_qstor and
pata_octeon_cf which inherit from ata_sff_port_ops don't need to worry
about BMDMA ops being called.  Kill the dummy BMDMA ops.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

Showing 2 changed files with 0 additions and 32 deletions Side-by-side Diff

drivers/ata/pata_octeon_cf.c
Diff comments   View file @ d6b0de8
... ... @@ -750,20 +750,6 @@
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 753 * We don't do ATAPI DMA so return 0.
768 754 */
769 755 static int octeon_cf_check_atapi_dma(struct ata_queued_cmd *qc)
... ... @@ -804,10 +790,6 @@
804 790 .sff_dev_select = octeon_cf_dev_select,
805 791 .sff_irq_on = octeon_cf_irq_on,
806 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 793 .cable_detect = ata_cable_40wire,
812 794 .set_piomode = octeon_cf_set_piomode,
813 795 .set_dmamode = octeon_cf_set_dmamode,
drivers/ata/sata_qstor.c
Diff comments   View file @ d6b0de8
... ... @@ -120,8 +120,6 @@
120 120 static void qs_qc_prep(struct ata_queued_cmd *qc);
121 121 static unsigned int qs_qc_issue(struct ata_queued_cmd *qc);
122 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 123 static void qs_freeze(struct ata_port *ap);
126 124 static void qs_thaw(struct ata_port *ap);
127 125 static int qs_prereset(struct ata_link *link, unsigned long deadline);
... ... @@ -137,8 +135,6 @@
137 135 .inherits = &ata_sff_port_ops,
138 136  
139 137 .check_atapi_dma = qs_check_atapi_dma,
140   - .bmdma_stop = qs_bmdma_stop,
141   - .bmdma_status = qs_bmdma_status,
142 138 .qc_prep = qs_qc_prep,
143 139 .qc_issue = qs_qc_issue,
144 140  
... ... @@ -188,16 +184,6 @@
188 184 static int qs_check_atapi_dma(struct ata_queued_cmd *qc)
189 185 {
190 186 return 1; /* ATAPI DMA not supported */
191   -}
192   -
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 187 }
202 188  
203 189 static inline void qs_enter_reg_mode(struct ata_port *ap)