diff options
author | Tejun Heo <htejun@gmail.com> | 2008-04-07 09:47:16 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:21 -0400 |
commit | 9363c3825ea9ad76561eb48a395349dd29211ed6 (patch) | |
tree | abe89a0f7c82b805d84b1a211c97b317f6628d5f /drivers/ata/pata_ns87410.c | |
parent | b67a1064cb1c1d3b43e01e8b43a6a8dcdefed733 (diff) |
libata: rename SFF functions
SFF functions have confusing names. Some have sff prefix, some have
bmdma, some std, some pci and some none. Unify the naming by...
* SFF functions which are common to both BMDMA and non-BMDMA are
prefixed with ata_sff_.
* SFF functions which are specific to BMDMA are prefixed with
ata_bmdma_.
* SFF functions which are specific to PCI but apply to both BMDMA and
non-BMDMA are prefixed with ata_pci_sff_.
* SFF functions which are specific to PCI and BMDMA are prefixed with
ata_pci_bmdma_.
* Drop generic prefixes from LLD specific routines. For example,
bfin_std_dev_select -> bfin_dev_select.
The following renames are noteworthy.
ata_qc_issue_prot() -> ata_sff_qc_issue()
ata_pci_default_filter() -> ata_bmdma_mode_filter()
ata_dev_try_classify() -> ata_sff_dev_classify()
This rename is in preparation of separating SFF support out of libata
core layer. This patch strictly renames functions and doesn't
introduce any behavior difference.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/ata/pata_ns87410.c')
-rw-r--r-- | drivers/ata/pata_ns87410.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c index 4d2eefee7387..76d2455bc453 100644 --- a/drivers/ata/pata_ns87410.c +++ b/drivers/ata/pata_ns87410.c | |||
@@ -50,7 +50,7 @@ static int ns87410_pre_reset(struct ata_link *link, unsigned long deadline) | |||
50 | if (!pci_test_config_bits(pdev, &ns87410_enable_bits[ap->port_no])) | 50 | if (!pci_test_config_bits(pdev, &ns87410_enable_bits[ap->port_no])) |
51 | return -ENOENT; | 51 | return -ENOENT; |
52 | 52 | ||
53 | return ata_std_prereset(link, deadline); | 53 | return ata_sff_prereset(link, deadline); |
54 | } | 54 | } |
55 | 55 | ||
56 | /** | 56 | /** |
@@ -105,7 +105,7 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
105 | } | 105 | } |
106 | 106 | ||
107 | /** | 107 | /** |
108 | * ns87410_qc_issue_prot - command issue | 108 | * ns87410_qc_issue - command issue |
109 | * @qc: command pending | 109 | * @qc: command pending |
110 | * | 110 | * |
111 | * Called when the libata layer is about to issue a command. We wrap | 111 | * Called when the libata layer is about to issue a command. We wrap |
@@ -113,7 +113,7 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
113 | * necessary. | 113 | * necessary. |
114 | */ | 114 | */ |
115 | 115 | ||
116 | static unsigned int ns87410_qc_issue_prot(struct ata_queued_cmd *qc) | 116 | static unsigned int ns87410_qc_issue(struct ata_queued_cmd *qc) |
117 | { | 117 | { |
118 | struct ata_port *ap = qc->ap; | 118 | struct ata_port *ap = qc->ap; |
119 | struct ata_device *adev = qc->dev; | 119 | struct ata_device *adev = qc->dev; |
@@ -126,7 +126,7 @@ static unsigned int ns87410_qc_issue_prot(struct ata_queued_cmd *qc) | |||
126 | if (adev->pio_mode && adev != ap->private_data) | 126 | if (adev->pio_mode && adev != ap->private_data) |
127 | ns87410_set_piomode(ap, adev); | 127 | ns87410_set_piomode(ap, adev); |
128 | 128 | ||
129 | return ata_qc_issue_prot(qc); | 129 | return ata_sff_qc_issue(qc); |
130 | } | 130 | } |
131 | 131 | ||
132 | static struct scsi_host_template ns87410_sht = { | 132 | static struct scsi_host_template ns87410_sht = { |
@@ -135,7 +135,7 @@ static struct scsi_host_template ns87410_sht = { | |||
135 | 135 | ||
136 | static struct ata_port_operations ns87410_port_ops = { | 136 | static struct ata_port_operations ns87410_port_ops = { |
137 | .inherits = &ata_sff_port_ops, | 137 | .inherits = &ata_sff_port_ops, |
138 | .qc_issue = ns87410_qc_issue_prot, | 138 | .qc_issue = ns87410_qc_issue, |
139 | .cable_detect = ata_cable_40wire, | 139 | .cable_detect = ata_cable_40wire, |
140 | .set_piomode = ns87410_set_piomode, | 140 | .set_piomode = ns87410_set_piomode, |
141 | .prereset = ns87410_pre_reset, | 141 | .prereset = ns87410_pre_reset, |
@@ -149,7 +149,7 @@ static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
149 | .port_ops = &ns87410_port_ops | 149 | .port_ops = &ns87410_port_ops |
150 | }; | 150 | }; |
151 | const struct ata_port_info *ppi[] = { &info, NULL }; | 151 | const struct ata_port_info *ppi[] = { &info, NULL }; |
152 | return ata_pci_init_one(dev, ppi, &ns87410_sht, NULL); | 152 | return ata_pci_sff_init_one(dev, ppi, &ns87410_sht, NULL); |
153 | } | 153 | } |
154 | 154 | ||
155 | static const struct pci_device_id ns87410[] = { | 155 | static const struct pci_device_id ns87410[] = { |