aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_sl82c105.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_sl82c105.c')
-rw-r--r--drivers/ata/pata_sl82c105.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index c0f43bb25956..1388cef52c07 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -43,23 +43,24 @@ enum {
43 43
44/** 44/**
45 * sl82c105_pre_reset - probe begin 45 * sl82c105_pre_reset - probe begin
46 * @ap: ATA port 46 * @link: ATA link
47 * @deadline: deadline jiffies for the operation 47 * @deadline: deadline jiffies for the operation
48 * 48 *
49 * Set up cable type and use generic probe init 49 * Set up cable type and use generic probe init
50 */ 50 */
51 51
52static int sl82c105_pre_reset(struct ata_port *ap, unsigned long deadline) 52static int sl82c105_pre_reset(struct ata_link *link, unsigned long deadline)
53{ 53{
54 static const struct pci_bits sl82c105_enable_bits[] = { 54 static const struct pci_bits sl82c105_enable_bits[] = {
55 { 0x40, 1, 0x01, 0x01 }, 55 { 0x40, 1, 0x01, 0x01 },
56 { 0x40, 1, 0x10, 0x10 } 56 { 0x40, 1, 0x10, 0x10 }
57 }; 57 };
58 struct ata_port *ap = link->ap;
58 struct pci_dev *pdev = to_pci_dev(ap->host->dev); 59 struct pci_dev *pdev = to_pci_dev(ap->host->dev);
59 60
60 if (ap->port_no && !pci_test_config_bits(pdev, &sl82c105_enable_bits[ap->port_no])) 61 if (ap->port_no && !pci_test_config_bits(pdev, &sl82c105_enable_bits[ap->port_no]))
61 return -ENOENT; 62 return -ENOENT;
62 return ata_std_prereset(ap, deadline); 63 return ata_std_prereset(link, deadline);
63} 64}
64 65
65 66
@@ -224,7 +225,6 @@ static struct scsi_host_template sl82c105_sht = {
224}; 225};
225 226
226static struct ata_port_operations sl82c105_port_ops = { 227static struct ata_port_operations sl82c105_port_ops = {
227 .port_disable = ata_port_disable,
228 .set_piomode = sl82c105_set_piomode, 228 .set_piomode = sl82c105_set_piomode,
229 .mode_filter = ata_pci_default_filter, 229 .mode_filter = ata_pci_default_filter,
230 230
@@ -253,9 +253,8 @@ static struct ata_port_operations sl82c105_port_ops = {
253 .irq_handler = ata_interrupt, 253 .irq_handler = ata_interrupt,
254 .irq_clear = ata_bmdma_irq_clear, 254 .irq_clear = ata_bmdma_irq_clear,
255 .irq_on = ata_irq_on, 255 .irq_on = ata_irq_on,
256 .irq_ack = ata_irq_ack,
257 256
258 .port_start = ata_port_start, 257 .port_start = ata_sff_port_start,
259}; 258};
260 259
261/** 260/**