diff options
Diffstat (limited to 'drivers/ata/sata_vsc.c')
-rw-r--r-- | drivers/ata/sata_vsc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c index 4c69a705a483..d0d92f33de54 100644 --- a/drivers/ata/sata_vsc.c +++ b/drivers/ata/sata_vsc.c | |||
@@ -123,7 +123,7 @@ static void vsc_intr_mask_update(struct ata_port *ap, u8 ctl) | |||
123 | void __iomem *mask_addr; | 123 | void __iomem *mask_addr; |
124 | u8 mask; | 124 | u8 mask; |
125 | 125 | ||
126 | mask_addr = ap->host_set->mmio_base + | 126 | mask_addr = ap->host->mmio_base + |
127 | VSC_SATA_INT_MASK_OFFSET + ap->port_no; | 127 | VSC_SATA_INT_MASK_OFFSET + ap->port_no; |
128 | mask = readb(mask_addr); | 128 | mask = readb(mask_addr); |
129 | if (ctl & ATA_NIEN) | 129 | if (ctl & ATA_NIEN) |
@@ -206,20 +206,20 @@ static void vsc_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf) | |||
206 | static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance, | 206 | static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance, |
207 | struct pt_regs *regs) | 207 | struct pt_regs *regs) |
208 | { | 208 | { |
209 | struct ata_host_set *host_set = dev_instance; | 209 | struct ata_host *host = dev_instance; |
210 | unsigned int i; | 210 | unsigned int i; |
211 | unsigned int handled = 0; | 211 | unsigned int handled = 0; |
212 | u32 int_status; | 212 | u32 int_status; |
213 | 213 | ||
214 | spin_lock(&host_set->lock); | 214 | spin_lock(&host->lock); |
215 | 215 | ||
216 | int_status = readl(host_set->mmio_base + VSC_SATA_INT_STAT_OFFSET); | 216 | int_status = readl(host->mmio_base + VSC_SATA_INT_STAT_OFFSET); |
217 | 217 | ||
218 | for (i = 0; i < host_set->n_ports; i++) { | 218 | for (i = 0; i < host->n_ports; i++) { |
219 | if (int_status & ((u32) 0xFF << (8 * i))) { | 219 | if (int_status & ((u32) 0xFF << (8 * i))) { |
220 | struct ata_port *ap; | 220 | struct ata_port *ap; |
221 | 221 | ||
222 | ap = host_set->ports[i]; | 222 | ap = host->ports[i]; |
223 | 223 | ||
224 | if (is_vsc_sata_int_err(i, int_status)) { | 224 | if (is_vsc_sata_int_err(i, int_status)) { |
225 | u32 err_status; | 225 | u32 err_status; |
@@ -259,7 +259,7 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance, | |||
259 | } | 259 | } |
260 | } | 260 | } |
261 | 261 | ||
262 | spin_unlock(&host_set->lock); | 262 | spin_unlock(&host->lock); |
263 | 263 | ||
264 | return IRQ_RETVAL(handled); | 264 | return IRQ_RETVAL(handled); |
265 | } | 265 | } |
@@ -395,7 +395,7 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d | |||
395 | pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x80); | 395 | pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x80); |
396 | 396 | ||
397 | probe_ent->sht = &vsc_sata_sht; | 397 | probe_ent->sht = &vsc_sata_sht; |
398 | probe_ent->host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 398 | probe_ent->port_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
399 | ATA_FLAG_MMIO; | 399 | ATA_FLAG_MMIO; |
400 | probe_ent->port_ops = &vsc_sata_ops; | 400 | probe_ent->port_ops = &vsc_sata_ops; |
401 | probe_ent->n_ports = 4; | 401 | probe_ent->n_ports = 4; |