diff options
author | Tejun Heo <tj@kernel.org> | 2010-05-10 15:41:33 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2010-05-19 13:31:29 -0400 |
commit | 8930ff254a3a80d4477c3391ade07d6dd2a036c7 (patch) | |
tree | 2c83672d48fbe306d6968f9f54b0d80fb736d5f9 /drivers/ata/pata_macio.c | |
parent | 9f2f72107ff621fdf3066e5a1b5ecb03ee587ebc (diff) |
libata-sff: clean up inheritance in several drivers
1. pata_cmd640 is PIO only. Inherit from sff.
2. pata_macio is BMDMA. Inherit from bmdma and drop explicit
bmdma_mode_filter() setting.
3. In sata_mv, unlike mv5, mv6 is BMDMA. Inherit from bmdma and
don't clear ->post_internal_cmd().
4. bf54x and icside are quasi-BMDMA controllers which don't use the
standard BMDMA registers so they don't initialize bmdma_addr and
inherit from sff to avoid the default mode_filter which disables
DMA modes if bmdma_addr is not initialized.
For 2 and 3, this patch makes the drivers explicitly specify
->mode_filter to ATA_OP_NULL while inheriting from ata_bmdma_port_ops.
These will be removed by the next patch.
This patch makes all and only BMDMA drivers inherit from
ata_bmdma_port_ops to ease further SFF/BMDMA separation.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/pata_macio.c')
-rw-r--r-- | drivers/ata/pata_macio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c index 211b6438b3a0..17e4e5d19696 100644 --- a/drivers/ata/pata_macio.c +++ b/drivers/ata/pata_macio.c | |||
@@ -917,7 +917,7 @@ static struct scsi_host_template pata_macio_sht = { | |||
917 | }; | 917 | }; |
918 | 918 | ||
919 | static struct ata_port_operations pata_macio_ops = { | 919 | static struct ata_port_operations pata_macio_ops = { |
920 | .inherits = &ata_sff_port_ops, | 920 | .inherits = &ata_bmdma_port_ops, |
921 | 921 | ||
922 | .freeze = pata_macio_freeze, | 922 | .freeze = pata_macio_freeze, |
923 | .set_piomode = pata_macio_set_timings, | 923 | .set_piomode = pata_macio_set_timings, |
@@ -925,7 +925,6 @@ static struct ata_port_operations pata_macio_ops = { | |||
925 | .cable_detect = pata_macio_cable_detect, | 925 | .cable_detect = pata_macio_cable_detect, |
926 | .sff_dev_select = pata_macio_dev_select, | 926 | .sff_dev_select = pata_macio_dev_select, |
927 | .qc_prep = pata_macio_qc_prep, | 927 | .qc_prep = pata_macio_qc_prep, |
928 | .mode_filter = ata_bmdma_mode_filter, | ||
929 | .bmdma_setup = pata_macio_bmdma_setup, | 928 | .bmdma_setup = pata_macio_bmdma_setup, |
930 | .bmdma_start = pata_macio_bmdma_start, | 929 | .bmdma_start = pata_macio_bmdma_start, |
931 | .bmdma_stop = pata_macio_bmdma_stop, | 930 | .bmdma_stop = pata_macio_bmdma_stop, |