leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Tejun Heo 2010-05-19 22:10:23 +02:00 committed by Jeff Garzik
parent 1c5afdf7a6
commit d6b0de8c28
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/ata/pata_octeon_cf.c
View File

@ -749,20 +749,6 @@ static void octeon_cf_dev_config(struct ata_device *dev)
dev->max_sectors = min(dev->max_sectors, 4095U); dev->max_sectors = min(dev->max_sectors, 4095U);
} }
/*
* Trap if driver tries to do standard bmdma commands. They are not
* supported.
*/
static void unreachable_qc(struct ata_queued_cmd *qc)
{
BUG();
}
static u8 unreachable_port(struct ata_port *ap)
{
BUG();
}
/* /*
* We don't do ATAPI DMA so return 0. * We don't do ATAPI DMA so return 0.
*/ */
@ -804,10 +790,6 @@ static struct ata_port_operations octeon_cf_ops = {
.sff_dev_select = octeon_cf_dev_select, .sff_dev_select = octeon_cf_dev_select,
.sff_irq_on = octeon_cf_irq_on, .sff_irq_on = octeon_cf_irq_on,
.sff_irq_clear = octeon_cf_irq_clear, .sff_irq_clear = octeon_cf_irq_clear,
.bmdma_setup = unreachable_qc,
.bmdma_start = unreachable_qc,
.bmdma_stop = unreachable_qc,
.bmdma_status = unreachable_port,
.cable_detect = ata_cable_40wire, .cable_detect = ata_cable_40wire,
.set_piomode = octeon_cf_set_piomode, .set_piomode = octeon_cf_set_piomode,
.set_dmamode = octeon_cf_set_dmamode, .set_dmamode = octeon_cf_set_dmamode,

14
drivers/ata/sata_qstor.c
View File

@ -120,8 +120,6 @@ static void qs_host_stop(struct ata_host *host);
static void qs_qc_prep(struct ata_queued_cmd *qc); static void qs_qc_prep(struct ata_queued_cmd *qc);
static unsigned int qs_qc_issue(struct ata_queued_cmd *qc); static unsigned int qs_qc_issue(struct ata_queued_cmd *qc);
static int qs_check_atapi_dma(struct ata_queued_cmd *qc); static int qs_check_atapi_dma(struct ata_queued_cmd *qc);
static void qs_bmdma_stop(struct ata_queued_cmd *qc);
static u8 qs_bmdma_status(struct ata_port *ap);
static void qs_freeze(struct ata_port *ap); static void qs_freeze(struct ata_port *ap);
static void qs_thaw(struct ata_port *ap); static void qs_thaw(struct ata_port *ap);
static int qs_prereset(struct ata_link *link, unsigned long deadline); static int qs_prereset(struct ata_link *link, unsigned long deadline);
@ -137,8 +135,6 @@ static struct ata_port_operations qs_ata_ops = {
.inherits = &ata_sff_port_ops, .inherits = &ata_sff_port_ops,
.check_atapi_dma = qs_check_atapi_dma, .check_atapi_dma = qs_check_atapi_dma,
.bmdma_stop = qs_bmdma_stop,
.bmdma_status = qs_bmdma_status,
.qc_prep = qs_qc_prep, .qc_prep = qs_qc_prep,
.qc_issue = qs_qc_issue, .qc_issue = qs_qc_issue,
@ -190,16 +186,6 @@ static int qs_check_atapi_dma(struct ata_queued_cmd *qc)
return 1; /* ATAPI DMA not supported */ return 1; /* ATAPI DMA not supported */
} }
static void qs_bmdma_stop(struct ata_queued_cmd *qc)
{
/* nothing */
}
static u8 qs_bmdma_status(struct ata_port *ap)
{
return 0;
}
static inline void qs_enter_reg_mode(struct ata_port *ap) static inline void qs_enter_reg_mode(struct ata_port *ap)
{ {
u8 __iomem *chan = qs_mmio_base(ap->host) + (ap->port_no * 0x4000); u8 __iomem *chan = qs_mmio_base(ap->host) + (ap->port_no * 0x4000);