aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-04-07 09:47:17 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:22 -0400
commit288623a06c652239d2f57d271af12bb024cf7218 (patch)
treee693ca8a46cbedc522cb6f5ca3395d3dc692cfb3 /drivers/ata
parent5682ed33aae05d10a25c95633ef9d9c062825888 (diff)
libata: clean up port_ops->sff_irq_clear()
->sff_irq_clear() is called only from SFF interrupt handler, so there is no reason to initialize it for non-SFF controllers. Also, ata_sff_irq_clear() can handle both BMDMA and non-BMDMA SFF controllers. This patch kills ata_noop_irq_clear() and removes it from base port_ops and sets ->sff_irq_clear to ata_sff_irq_clear() in sff port_ops instead of bmdma port_ops. Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c10
-rw-r--r--drivers/ata/libata-sff.c2
2 files changed, 1 insertions, 11 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index a01e02c5ce7a..fd912ccb90f8 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -74,7 +74,6 @@ const unsigned long sata_deb_timing_hotplug[] = { 25, 500, 2000 };
74const unsigned long sata_deb_timing_long[] = { 100, 2000, 5000 }; 74const unsigned long sata_deb_timing_long[] = { 100, 2000, 5000 };
75 75
76const struct ata_port_operations ata_base_port_ops = { 76const struct ata_port_operations ata_base_port_ops = {
77 .sff_irq_clear = ata_noop_irq_clear,
78 .prereset = ata_sff_prereset, 77 .prereset = ata_sff_prereset,
79 .hardreset = sata_sff_hardreset, 78 .hardreset = sata_sff_hardreset,
80 .postreset = ata_sff_postreset, 79 .postreset = ata_sff_postreset,
@@ -387,14 +386,6 @@ int atapi_cmd_type(u8 opcode)
387} 386}
388 387
389/** 388/**
390 * ata_noop_irq_clear - Noop placeholder for irq_clear
391 * @ap: Port associated with this ATA transaction.
392 */
393void ata_noop_irq_clear(struct ata_port *ap)
394{
395}
396
397/**
398 * ata_tf_to_fis - Convert ATA taskfile to SATA FIS structure 389 * ata_tf_to_fis - Convert ATA taskfile to SATA FIS structure
399 * @tf: Taskfile to convert 390 * @tf: Taskfile to convert
400 * @pmp: Port multiplier port 391 * @pmp: Port multiplier port
@@ -6108,7 +6099,6 @@ EXPORT_SYMBOL_GPL(ata_port_start);
6108EXPORT_SYMBOL_GPL(ata_do_set_mode); 6099EXPORT_SYMBOL_GPL(ata_do_set_mode);
6109EXPORT_SYMBOL_GPL(ata_std_qc_defer); 6100EXPORT_SYMBOL_GPL(ata_std_qc_defer);
6110EXPORT_SYMBOL_GPL(ata_noop_qc_prep); 6101EXPORT_SYMBOL_GPL(ata_noop_qc_prep);
6111EXPORT_SYMBOL_GPL(ata_noop_irq_clear);
6112EXPORT_SYMBOL_GPL(ata_port_probe); 6102EXPORT_SYMBOL_GPL(ata_port_probe);
6113EXPORT_SYMBOL_GPL(ata_dev_disable); 6103EXPORT_SYMBOL_GPL(ata_dev_disable);
6114EXPORT_SYMBOL_GPL(sata_set_spd); 6104EXPORT_SYMBOL_GPL(sata_set_spd);
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 04024a556660..c11601617134 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -58,6 +58,7 @@ const struct ata_port_operations ata_sff_port_ops = {
58 .sff_exec_command = ata_sff_exec_command, 58 .sff_exec_command = ata_sff_exec_command,
59 .sff_data_xfer = ata_sff_data_xfer, 59 .sff_data_xfer = ata_sff_data_xfer,
60 .sff_irq_on = ata_sff_irq_on, 60 .sff_irq_on = ata_sff_irq_on,
61 .sff_irq_clear = ata_sff_irq_clear,
61 62
62 .port_start = ata_sff_port_start, 63 .port_start = ata_sff_port_start,
63}; 64};
@@ -71,7 +72,6 @@ const struct ata_port_operations ata_bmdma_port_ops = {
71 .bmdma_start = ata_bmdma_start, 72 .bmdma_start = ata_bmdma_start,
72 .bmdma_stop = ata_bmdma_stop, 73 .bmdma_stop = ata_bmdma_stop,
73 .bmdma_status = ata_bmdma_status, 74 .bmdma_status = ata_bmdma_status,
74 .sff_irq_clear = ata_sff_irq_clear,
75}; 75};
76 76
77/** 77/**