aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_oldpiix.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_oldpiix.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_oldpiix.c')
-rw-r--r--drivers/ata/pata_oldpiix.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index c1da79a76439..e678af383d13 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -47,7 +47,7 @@ static int oldpiix_pre_reset(struct ata_link *link, unsigned long deadline)
47 if (!pci_test_config_bits(pdev, &oldpiix_enable_bits[ap->port_no])) 47 if (!pci_test_config_bits(pdev, &oldpiix_enable_bits[ap->port_no]))
48 return -ENOENT; 48 return -ENOENT;
49 49
50 return ata_std_prereset(link, deadline); 50 return ata_sff_prereset(link, deadline);
51} 51}
52 52
53/** 53/**
@@ -181,7 +181,7 @@ static void oldpiix_set_dmamode (struct ata_port *ap, struct ata_device *adev)
181} 181}
182 182
183/** 183/**
184 * oldpiix_qc_issue_prot - command issue 184 * oldpiix_qc_issue - command issue
185 * @qc: command pending 185 * @qc: command pending
186 * 186 *
187 * Called when the libata layer is about to issue a command. We wrap 187 * Called when the libata layer is about to issue a command. We wrap
@@ -191,7 +191,7 @@ static void oldpiix_set_dmamode (struct ata_port *ap, struct ata_device *adev)
191 * be made PIO0. 191 * be made PIO0.
192 */ 192 */
193 193
194static unsigned int oldpiix_qc_issue_prot(struct ata_queued_cmd *qc) 194static unsigned int oldpiix_qc_issue(struct ata_queued_cmd *qc)
195{ 195{
196 struct ata_port *ap = qc->ap; 196 struct ata_port *ap = qc->ap;
197 struct ata_device *adev = qc->dev; 197 struct ata_device *adev = qc->dev;
@@ -201,7 +201,7 @@ static unsigned int oldpiix_qc_issue_prot(struct ata_queued_cmd *qc)
201 if (adev->dma_mode) 201 if (adev->dma_mode)
202 oldpiix_set_dmamode(ap, adev); 202 oldpiix_set_dmamode(ap, adev);
203 } 203 }
204 return ata_qc_issue_prot(qc); 204 return ata_sff_qc_issue(qc);
205} 205}
206 206
207 207
@@ -211,7 +211,7 @@ static struct scsi_host_template oldpiix_sht = {
211 211
212static struct ata_port_operations oldpiix_pata_ops = { 212static struct ata_port_operations oldpiix_pata_ops = {
213 .inherits = &ata_bmdma_port_ops, 213 .inherits = &ata_bmdma_port_ops,
214 .qc_issue = oldpiix_qc_issue_prot, 214 .qc_issue = oldpiix_qc_issue,
215 .cable_detect = ata_cable_40wire, 215 .cable_detect = ata_cable_40wire,
216 .set_piomode = oldpiix_set_piomode, 216 .set_piomode = oldpiix_set_piomode,
217 .set_dmamode = oldpiix_set_dmamode, 217 .set_dmamode = oldpiix_set_dmamode,
@@ -249,7 +249,7 @@ static int oldpiix_init_one (struct pci_dev *pdev, const struct pci_device_id *e
249 dev_printk(KERN_DEBUG, &pdev->dev, 249 dev_printk(KERN_DEBUG, &pdev->dev,
250 "version " DRV_VERSION "\n"); 250 "version " DRV_VERSION "\n");
251 251
252 return ata_pci_init_one(pdev, ppi, &oldpiix_sht, NULL); 252 return ata_pci_sff_init_one(pdev, ppi, &oldpiix_sht, NULL);
253} 253}
254 254
255static const struct pci_device_id oldpiix_pci_tbl[] = { 255static const struct pci_device_id oldpiix_pci_tbl[] = {