diff options
Diffstat (limited to 'drivers/ata/pata_cs5530.c')
-rw-r--r-- | drivers/ata/pata_cs5530.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c index ac3ad55d7c3c..744beebaaf49 100644 --- a/drivers/ata/pata_cs5530.c +++ b/drivers/ata/pata_cs5530.c | |||
@@ -133,7 +133,7 @@ static void cs5530_set_dmamode(struct ata_port *ap, struct ata_device *adev) | |||
133 | } | 133 | } |
134 | 134 | ||
135 | /** | 135 | /** |
136 | * cs5530_qc_issue_prot - command issue | 136 | * cs5530_qc_issue - command issue |
137 | * @qc: command pending | 137 | * @qc: command pending |
138 | * | 138 | * |
139 | * Called when the libata layer is about to issue a command. We wrap | 139 | * Called when the libata layer is about to issue a command. We wrap |
@@ -142,7 +142,7 @@ static void cs5530_set_dmamode(struct ata_port *ap, struct ata_device *adev) | |||
142 | * one MWDMA/UDMA bit. | 142 | * one MWDMA/UDMA bit. |
143 | */ | 143 | */ |
144 | 144 | ||
145 | static unsigned int cs5530_qc_issue_prot(struct ata_queued_cmd *qc) | 145 | static unsigned int cs5530_qc_issue(struct ata_queued_cmd *qc) |
146 | { | 146 | { |
147 | struct ata_port *ap = qc->ap; | 147 | struct ata_port *ap = qc->ap; |
148 | struct ata_device *adev = qc->dev; | 148 | struct ata_device *adev = qc->dev; |
@@ -157,7 +157,7 @@ static unsigned int cs5530_qc_issue_prot(struct ata_queued_cmd *qc) | |||
157 | cs5530_set_dmamode(ap, adev); | 157 | cs5530_set_dmamode(ap, adev); |
158 | } | 158 | } |
159 | 159 | ||
160 | return ata_qc_issue_prot(qc); | 160 | return ata_sff_qc_issue(qc); |
161 | } | 161 | } |
162 | 162 | ||
163 | static struct scsi_host_template cs5530_sht = { | 163 | static struct scsi_host_template cs5530_sht = { |
@@ -168,8 +168,8 @@ static struct scsi_host_template cs5530_sht = { | |||
168 | static struct ata_port_operations cs5530_port_ops = { | 168 | static struct ata_port_operations cs5530_port_ops = { |
169 | .inherits = &ata_bmdma_port_ops, | 169 | .inherits = &ata_bmdma_port_ops, |
170 | 170 | ||
171 | .qc_prep = ata_dumb_qc_prep, | 171 | .qc_prep = ata_sff_dumb_qc_prep, |
172 | .qc_issue = cs5530_qc_issue_prot, | 172 | .qc_issue = cs5530_qc_issue, |
173 | 173 | ||
174 | .cable_detect = ata_cable_40wire, | 174 | .cable_detect = ata_cable_40wire, |
175 | .set_piomode = cs5530_set_piomode, | 175 | .set_piomode = cs5530_set_piomode, |
@@ -325,7 +325,7 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
325 | ppi[1] = &info_palmax_secondary; | 325 | ppi[1] = &info_palmax_secondary; |
326 | 326 | ||
327 | /* Now kick off ATA set up */ | 327 | /* Now kick off ATA set up */ |
328 | return ata_pci_init_one(pdev, ppi, &cs5530_sht, NULL); | 328 | return ata_pci_sff_init_one(pdev, ppi, &cs5530_sht, NULL); |
329 | } | 329 | } |
330 | 330 | ||
331 | #ifdef CONFIG_PM | 331 | #ifdef CONFIG_PM |