diff options
author | Tejun Heo <htejun@gmail.com> | 2008-04-07 09:47:21 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:24 -0400 |
commit | c9f75b04ed5ed65a058d18a8a8dda50632a96de8 (patch) | |
tree | e0100eae3b10006a8618ddb32bdf971e20db0dd8 | |
parent | 520d06f92b32d7abe5127d7cc46a819db0f384e6 (diff) |
libata: kill ata_noop_dev_select()
Now that SFF assumptions are separated out from non-SFF reset
sequence, port_ops->sff_dev_select() is no longer necessary for
non-SFF controllers. Kill ata_noop_dev_select() and ->sff_dev_select
initialization from base and other non-SFF port_ops.
Signed-off-by: Tejun Heo <htejun@gmail.com>
-rw-r--r-- | drivers/ata/libata-core.c | 19 | ||||
-rw-r--r-- | drivers/scsi/ipr.c | 1 | ||||
-rw-r--r-- | drivers/scsi/libsas/sas_ata.c | 1 | ||||
-rw-r--r-- | include/linux/libata.h | 1 |
4 files changed, 0 insertions, 22 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index e8598eeeec39..f23f50af551c 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -84,7 +84,6 @@ const struct ata_port_operations sata_port_ops = { | |||
84 | 84 | ||
85 | .qc_defer = ata_std_qc_defer, | 85 | .qc_defer = ata_std_qc_defer, |
86 | .hardreset = sata_std_hardreset, | 86 | .hardreset = sata_std_hardreset, |
87 | .sff_dev_select = ata_noop_dev_select, | ||
88 | }; | 87 | }; |
89 | 88 | ||
90 | const struct ata_port_operations sata_pmp_port_ops = { | 89 | const struct ata_port_operations sata_pmp_port_ops = { |
@@ -1432,22 +1431,6 @@ static int ata_hpa_resize(struct ata_device *dev) | |||
1432 | } | 1431 | } |
1433 | 1432 | ||
1434 | /** | 1433 | /** |
1435 | * ata_noop_dev_select - Select device 0/1 on ATA bus | ||
1436 | * @ap: ATA channel to manipulate | ||
1437 | * @device: ATA device (numbered from zero) to select | ||
1438 | * | ||
1439 | * This function performs no actual function. | ||
1440 | * | ||
1441 | * May be used as the dev_select() entry in ata_port_operations. | ||
1442 | * | ||
1443 | * LOCKING: | ||
1444 | * caller. | ||
1445 | */ | ||
1446 | void ata_noop_dev_select(struct ata_port *ap, unsigned int device) | ||
1447 | { | ||
1448 | } | ||
1449 | |||
1450 | /** | ||
1451 | * ata_dump_id - IDENTIFY DEVICE info debugging output | 1434 | * ata_dump_id - IDENTIFY DEVICE info debugging output |
1452 | * @id: IDENTIFY DEVICE page to dump | 1435 | * @id: IDENTIFY DEVICE page to dump |
1453 | * | 1436 | * |
@@ -6193,7 +6176,6 @@ static unsigned int ata_dummy_qc_issue(struct ata_queued_cmd *qc) | |||
6193 | struct ata_port_operations ata_dummy_port_ops = { | 6176 | struct ata_port_operations ata_dummy_port_ops = { |
6194 | .sff_check_status = ata_dummy_check_status, | 6177 | .sff_check_status = ata_dummy_check_status, |
6195 | .sff_check_altstatus = ata_dummy_check_status, | 6178 | .sff_check_altstatus = ata_dummy_check_status, |
6196 | .sff_dev_select = ata_noop_dev_select, | ||
6197 | .qc_prep = ata_noop_qc_prep, | 6179 | .qc_prep = ata_noop_qc_prep, |
6198 | .qc_issue = ata_dummy_qc_issue, | 6180 | .qc_issue = ata_dummy_qc_issue, |
6199 | .freeze = ata_dummy_noret, | 6181 | .freeze = ata_dummy_noret, |
@@ -6234,7 +6216,6 @@ EXPORT_SYMBOL_GPL(ata_host_detach); | |||
6234 | EXPORT_SYMBOL_GPL(ata_sg_init); | 6216 | EXPORT_SYMBOL_GPL(ata_sg_init); |
6235 | EXPORT_SYMBOL_GPL(ata_qc_complete); | 6217 | EXPORT_SYMBOL_GPL(ata_qc_complete); |
6236 | EXPORT_SYMBOL_GPL(ata_qc_complete_multiple); | 6218 | EXPORT_SYMBOL_GPL(ata_qc_complete_multiple); |
6237 | EXPORT_SYMBOL_GPL(ata_noop_dev_select); | ||
6238 | EXPORT_SYMBOL_GPL(sata_print_link_status); | 6219 | EXPORT_SYMBOL_GPL(sata_print_link_status); |
6239 | EXPORT_SYMBOL_GPL(atapi_cmd_type); | 6220 | EXPORT_SYMBOL_GPL(atapi_cmd_type); |
6240 | EXPORT_SYMBOL_GPL(ata_tf_to_fis); | 6221 | EXPORT_SYMBOL_GPL(ata_tf_to_fis); |
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 5a95ea7c4dba..65dc18dea845 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -5247,7 +5247,6 @@ static bool ipr_qc_fill_rtf(struct ata_queued_cmd *qc) | |||
5247 | } | 5247 | } |
5248 | 5248 | ||
5249 | static struct ata_port_operations ipr_sata_ops = { | 5249 | static struct ata_port_operations ipr_sata_ops = { |
5250 | .sff_dev_select = ata_noop_dev_select, | ||
5251 | .phy_reset = ipr_ata_phy_reset, | 5250 | .phy_reset = ipr_ata_phy_reset, |
5252 | .hardreset = ipr_sata_reset, | 5251 | .hardreset = ipr_sata_reset, |
5253 | .post_internal_cmd = ipr_ata_post_internal, | 5252 | .post_internal_cmd = ipr_ata_post_internal, |
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 5c114bb7e907..a4811e4106df 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c | |||
@@ -344,7 +344,6 @@ static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in, | |||
344 | } | 344 | } |
345 | 345 | ||
346 | static struct ata_port_operations sas_sata_ops = { | 346 | static struct ata_port_operations sas_sata_ops = { |
347 | .sff_dev_select = ata_noop_dev_select, | ||
348 | .phy_reset = sas_ata_phy_reset, | 347 | .phy_reset = sas_ata_phy_reset, |
349 | .post_internal_cmd = sas_ata_post_internal, | 348 | .post_internal_cmd = sas_ata_post_internal, |
350 | .qc_prep = ata_noop_qc_prep, | 349 | .qc_prep = ata_noop_qc_prep, |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 1d8b6b7de0a2..037db1883bae 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -911,7 +911,6 @@ extern unsigned long ata_xfer_mode2mask(u8 xfer_mode); | |||
911 | extern int ata_xfer_mode2shift(unsigned long xfer_mode); | 911 | extern int ata_xfer_mode2shift(unsigned long xfer_mode); |
912 | extern const char *ata_mode_string(unsigned long xfer_mask); | 912 | extern const char *ata_mode_string(unsigned long xfer_mask); |
913 | extern unsigned long ata_id_xfermask(const u16 *id); | 913 | extern unsigned long ata_id_xfermask(const u16 *id); |
914 | extern void ata_noop_dev_select(struct ata_port *ap, unsigned int device); | ||
915 | extern int ata_port_start(struct ata_port *ap); | 914 | extern int ata_port_start(struct ata_port *ap); |
916 | extern int ata_std_qc_defer(struct ata_queued_cmd *qc); | 915 | extern int ata_std_qc_defer(struct ata_queued_cmd *qc); |
917 | extern void ata_noop_qc_prep(struct ata_queued_cmd *qc); | 916 | extern void ata_noop_qc_prep(struct ata_queued_cmd *qc); |