aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_pcmcia.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_pcmcia.c')
-rw-r--r--drivers/ata/pata_pcmcia.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 890f649ddcce..9bfe12ac851a 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -56,7 +56,7 @@ struct ata_pcmcia_info {
56 56
57/** 57/**
58 * pcmcia_set_mode - PCMCIA specific mode setup 58 * pcmcia_set_mode - PCMCIA specific mode setup
59 * @ap: Port 59 * @link: link
60 * @r_failed_dev: Return pointer for failed device 60 * @r_failed_dev: Return pointer for failed device
61 * 61 *
62 * Perform the tuning and setup of the devices and timings, which 62 * Perform the tuning and setup of the devices and timings, which
@@ -65,13 +65,13 @@ struct ata_pcmcia_info {
65 * decode, which alas is embarrassingly common in the PC world 65 * decode, which alas is embarrassingly common in the PC world
66 */ 66 */
67 67
68static int pcmcia_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev) 68static int pcmcia_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
69{ 69{
70 struct ata_device *master = &ap->link.device[0]; 70 struct ata_device *master = &link->device[0];
71 struct ata_device *slave = &ap->link.device[1]; 71 struct ata_device *slave = &link->device[1];
72 72
73 if (!ata_dev_enabled(master) || !ata_dev_enabled(slave)) 73 if (!ata_dev_enabled(master) || !ata_dev_enabled(slave))
74 return ata_do_set_mode(ap, r_failed_dev); 74 return ata_do_set_mode(link, r_failed_dev);
75 75
76 if (memcmp(master->id + ATA_ID_FW_REV, slave->id + ATA_ID_FW_REV, 76 if (memcmp(master->id + ATA_ID_FW_REV, slave->id + ATA_ID_FW_REV,
77 ATA_ID_FW_REV_LEN + ATA_ID_PROD_LEN) == 0) 77 ATA_ID_FW_REV_LEN + ATA_ID_PROD_LEN) == 0)
@@ -84,7 +84,7 @@ static int pcmcia_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev
84 ata_dev_disable(slave); 84 ata_dev_disable(slave);
85 } 85 }
86 } 86 }
87 return ata_do_set_mode(ap, r_failed_dev); 87 return ata_do_set_mode(link, r_failed_dev);
88} 88}
89 89
90static struct scsi_host_template pcmcia_sht = { 90static struct scsi_host_template pcmcia_sht = {