From: Andrew Morton <akpm@osdl.org>

tra, la la.

Cc: Matthieu CASTET <castet.matthieu@free.fr>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Tejun Heo <htejun@gmail.com>

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/ata/pata_via.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff -puN drivers/ata/pata_via.c~via-pata-controller-xfer-fixes-fix drivers/ata/pata_via.c
--- a/drivers/ata/pata_via.c~via-pata-controller-xfer-fixes-fix
+++ a/drivers/ata/pata_via.c
@@ -303,17 +303,17 @@ static void via_set_dmamode(struct ata_p
 static irqreturn_t pata_via_interrupt(int irq, void *dev_instance,
 					struct pt_regs *regs)
 {
-	struct ata_host_set *host_set = dev_instance;
+	struct ata_host *host = dev_instance;
 	unsigned int i;
 	unsigned int handled = 0;
 	unsigned long flags;
 
 	/* TODO: make _irqsave conditional on x86 PCI IDE legacy mode */
-	spin_lock_irqsave(&host_set->lock, flags);
-	for (i = 0; i < host_set->n_ports; i++) {
+	spin_lock_irqsave(&host->lock, flags);
+	for (i = 0; i < host->n_ports; i++) {
 		struct ata_port *ap;
 
-		ap = host_set->ports[i];
+		ap = host->ports[i];
 		if (ap && !(ap->flags & ATA_FLAG_DISABLED)) {
 			struct ata_queued_cmd *qc;
 
@@ -351,7 +351,7 @@ static irqreturn_t pata_via_interrupt(in
 			handled |= ata_host_intr(ap, qc);
 		}
 	}
-	spin_unlock_irqrestore(&host_set->lock, flags);
+	spin_unlock_irqrestore(&host->lock, flags);
 
 	return IRQ_RETVAL(handled);
 }
_