aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_sis.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-03-24 23:22:48 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:17 -0400
commit6bd99b4e0998571808fc1f09d5162348f21ff8c1 (patch)
treee338bd445aaa5cda4bbf1f5598acf70f0d6b68de /drivers/ata/sata_sis.c
parent358f9a77a668660729e705fde9c3cf69f013aa98 (diff)
libata: normalize port_info, port_operations and sht tables
Over the time, port info, ops and sht structures developed quite a bit of inconsistencies. This patch updates drivers. * Enable/disable_pm callbacks added to all ahci ops tables. * Every driver for SFF controllers now uses ata_sff_port_start() instead of ata_port_start() unless the driver has custom implementation. * Every driver for SFF controllers now uses ata_pci_default_filter() unless the driver has custom implementation. * Removed an odd port_info->sht initialization from ata_piix.c. Likely a merge byproduct. * A port which has ATA_FLAG_SATA set doesn't need to set cable_detect to ata_cable_sata(). Remove it from via and mv port ops. * Some drivers had unnecessary .max_sectors initialization which is ignored and was missing .slave_destroy callback. Fixed. * Removed unnecessary sht initializations port_info's. * Removed onsolete scsi device suspend/resume callbacks from pata_bf54x. * No reason to set ata_pci_default_filter() and bmdma functions for PIO-only drivers. Remove those callbacks and replace ata_bmdma_irq_clear with ata_noop_irq_clear. * pata_platform sets port_start to ata_dummy_ret0. port_start can just be set to NULL. * sata_fsl supports NCQ but was missing qc_defer. Fixed. * pata_rb600_cf implements dummy port_start. Removed. Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata/sata_sis.c')
-rw-r--r--drivers/ata/sata_sis.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index a01260a56432..a8adef9786b7 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -116,6 +116,7 @@ static const struct ata_port_operations sis_ops = {
116 .qc_prep = ata_qc_prep, 116 .qc_prep = ata_qc_prep,
117 .qc_issue = ata_qc_issue_prot, 117 .qc_issue = ata_qc_issue_prot,
118 .data_xfer = ata_data_xfer, 118 .data_xfer = ata_data_xfer,
119 .mode_filter = ata_pci_default_filter,
119 .freeze = ata_bmdma_freeze, 120 .freeze = ata_bmdma_freeze,
120 .thaw = ata_bmdma_thaw, 121 .thaw = ata_bmdma_thaw,
121 .error_handler = ata_bmdma_error_handler, 122 .error_handler = ata_bmdma_error_handler,
@@ -124,7 +125,7 @@ static const struct ata_port_operations sis_ops = {
124 .irq_on = ata_irq_on, 125 .irq_on = ata_irq_on,
125 .scr_read = sis_scr_read, 126 .scr_read = sis_scr_read,
126 .scr_write = sis_scr_write, 127 .scr_write = sis_scr_write,
127 .port_start = ata_port_start, 128 .port_start = ata_sff_port_start,
128}; 129};
129 130
130static const struct ata_port_info sis_port_info = { 131static const struct ata_port_info sis_port_info = {