aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_sc1200.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-04-07 09:47:16 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:21 -0400
commit9363c3825ea9ad76561eb48a395349dd29211ed6 (patch)
treeabe89a0f7c82b805d84b1a211c97b317f6628d5f /drivers/ata/pata_sc1200.c
parentb67a1064cb1c1d3b43e01e8b43a6a8dcdefed733 (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_sc1200.c')
-rw-r--r--drivers/ata/pata_sc1200.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 42efacf73c79..cbab397e3db7 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -151,7 +151,7 @@ static void sc1200_set_dmamode(struct ata_port *ap, struct ata_device *adev)
151} 151}
152 152
153/** 153/**
154 * sc1200_qc_issue_prot - command issue 154 * sc1200_qc_issue - command issue
155 * @qc: command pending 155 * @qc: command pending
156 * 156 *
157 * Called when the libata layer is about to issue a command. We wrap 157 * Called when the libata layer is about to issue a command. We wrap
@@ -160,7 +160,7 @@ static void sc1200_set_dmamode(struct ata_port *ap, struct ata_device *adev)
160 * one MWDMA/UDMA bit. 160 * one MWDMA/UDMA bit.
161 */ 161 */
162 162
163static unsigned int sc1200_qc_issue_prot(struct ata_queued_cmd *qc) 163static unsigned int sc1200_qc_issue(struct ata_queued_cmd *qc)
164{ 164{
165 struct ata_port *ap = qc->ap; 165 struct ata_port *ap = qc->ap;
166 struct ata_device *adev = qc->dev; 166 struct ata_device *adev = qc->dev;
@@ -175,7 +175,7 @@ static unsigned int sc1200_qc_issue_prot(struct ata_queued_cmd *qc)
175 sc1200_set_dmamode(ap, adev); 175 sc1200_set_dmamode(ap, adev);
176 } 176 }
177 177
178 return ata_qc_issue_prot(qc); 178 return ata_sff_qc_issue(qc);
179} 179}
180 180
181static struct scsi_host_template sc1200_sht = { 181static struct scsi_host_template sc1200_sht = {
@@ -185,8 +185,8 @@ static struct scsi_host_template sc1200_sht = {
185 185
186static struct ata_port_operations sc1200_port_ops = { 186static struct ata_port_operations sc1200_port_ops = {
187 .inherits = &ata_bmdma_port_ops, 187 .inherits = &ata_bmdma_port_ops,
188 .qc_prep = ata_dumb_qc_prep, 188 .qc_prep = ata_sff_dumb_qc_prep,
189 .qc_issue = sc1200_qc_issue_prot, 189 .qc_issue = sc1200_qc_issue,
190 .cable_detect = ata_cable_40wire, 190 .cable_detect = ata_cable_40wire,
191 .set_piomode = sc1200_set_piomode, 191 .set_piomode = sc1200_set_piomode,
192 .set_dmamode = sc1200_set_dmamode, 192 .set_dmamode = sc1200_set_dmamode,
@@ -213,7 +213,7 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
213 /* Can't enable port 2 yet, see top comments */ 213 /* Can't enable port 2 yet, see top comments */
214 const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; 214 const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info };
215 215
216 return ata_pci_init_one(dev, ppi, &sc1200_sht, NULL); 216 return ata_pci_sff_init_one(dev, ppi, &sc1200_sht, NULL);
217} 217}
218 218
219static const struct pci_device_id sc1200[] = { 219static const struct pci_device_id sc1200[] = {