aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-iops.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-15 15:21:49 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-15 15:21:49 -0400
commitf8c4bd0ab2b8783c0f080957781e9f70bee48eaa (patch)
treeb082fb55336f996b56c95d15072b1b4629b1ba12 /drivers/ide/ide-iops.c
parent135721446144af005109c25eeacca4fdddcd9a66 (diff)
ide: pass 'hwif *' instead of 'drive *' to ->OUTBSYNC method
There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r--drivers/ide/ide-iops.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 491980aab866..4c32cf0b623c 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -42,7 +42,7 @@ static void ide_outb (u8 val, unsigned long port)
42 outb(val, port); 42 outb(val, port);
43} 43}
44 44
45static void ide_outbsync (ide_drive_t *drive, u8 addr, unsigned long port) 45static void ide_outbsync(ide_hwif_t *hwif, u8 addr, unsigned long port)
46{ 46{
47 outb(addr, port); 47 outb(addr, port);
48} 48}
@@ -68,7 +68,7 @@ static void ide_mm_outb (u8 value, unsigned long port)
68 writeb(value, (void __iomem *) port); 68 writeb(value, (void __iomem *) port);
69} 69}
70 70
71static void ide_mm_outbsync (ide_drive_t *drive, u8 value, unsigned long port) 71static void ide_mm_outbsync(ide_hwif_t *hwif, u8 value, unsigned long port)
72{ 72{
73 writeb(value, (void __iomem *) port); 73 writeb(value, (void __iomem *) port);
74} 74}
@@ -686,7 +686,7 @@ int ide_driveid_update(ide_drive_t *drive)
686 SELECT_MASK(drive, 1); 686 SELECT_MASK(drive, 1);
687 ide_set_irq(drive, 0); 687 ide_set_irq(drive, 0);
688 msleep(50); 688 msleep(50);
689 hwif->OUTBSYNC(drive, WIN_IDENTIFY, hwif->io_ports.command_addr); 689 hwif->OUTBSYNC(hwif, WIN_IDENTIFY, hwif->io_ports.command_addr);
690 timeout = jiffies + WAIT_WORSTCASE; 690 timeout = jiffies + WAIT_WORSTCASE;
691 do { 691 do {
692 if (time_after(jiffies, timeout)) { 692 if (time_after(jiffies, timeout)) {
@@ -773,7 +773,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
773 ide_set_irq(drive, 0); 773 ide_set_irq(drive, 0);
774 hwif->OUTB(speed, io_ports->nsect_addr); 774 hwif->OUTB(speed, io_ports->nsect_addr);
775 hwif->OUTB(SETFEATURES_XFER, io_ports->feature_addr); 775 hwif->OUTB(SETFEATURES_XFER, io_ports->feature_addr);
776 hwif->OUTBSYNC(drive, WIN_SETFEATURES, io_ports->command_addr); 776 hwif->OUTBSYNC(hwif, WIN_SETFEATURES, io_ports->command_addr);
777 if (drive->quirk_list == 2) 777 if (drive->quirk_list == 2)
778 ide_set_irq(drive, 1); 778 ide_set_irq(drive, 1);
779 779
@@ -881,7 +881,7 @@ void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler,
881 881
882 spin_lock_irqsave(&ide_lock, flags); 882 spin_lock_irqsave(&ide_lock, flags);
883 __ide_set_handler(drive, handler, timeout, expiry); 883 __ide_set_handler(drive, handler, timeout, expiry);
884 hwif->OUTBSYNC(drive, cmd, hwif->io_ports.command_addr); 884 hwif->OUTBSYNC(hwif, cmd, hwif->io_ports.command_addr);
885 /* 885 /*
886 * Drive takes 400nS to respond, we must avoid the IRQ being 886 * Drive takes 400nS to respond, we must avoid the IRQ being
887 * serviced before that. 887 * serviced before that.
@@ -899,7 +899,7 @@ void ide_execute_pkt_cmd(ide_drive_t *drive)
899 unsigned long flags; 899 unsigned long flags;
900 900
901 spin_lock_irqsave(&ide_lock, flags); 901 spin_lock_irqsave(&ide_lock, flags);
902 hwif->OUTBSYNC(drive, WIN_PACKETCMD, hwif->io_ports.command_addr); 902 hwif->OUTBSYNC(hwif, WIN_PACKETCMD, hwif->io_ports.command_addr);
903 ndelay(400); 903 ndelay(400);
904 spin_unlock_irqrestore(&ide_lock, flags); 904 spin_unlock_irqrestore(&ide_lock, flags);
905} 905}
@@ -1094,7 +1094,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
1094 pre_reset(drive); 1094 pre_reset(drive);
1095 SELECT_DRIVE(drive); 1095 SELECT_DRIVE(drive);
1096 udelay (20); 1096 udelay (20);
1097 hwif->OUTBSYNC(drive, WIN_SRST, io_ports->command_addr); 1097 hwif->OUTBSYNC(hwif, WIN_SRST, io_ports->command_addr);
1098 ndelay(400); 1098 ndelay(400);
1099 hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; 1099 hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE;
1100 hwgroup->polling = 1; 1100 hwgroup->polling = 1;
@@ -1125,14 +1125,14 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
1125 * recover from reset very quickly, saving us the first 50ms wait time. 1125 * recover from reset very quickly, saving us the first 50ms wait time.
1126 */ 1126 */
1127 /* set SRST and nIEN */ 1127 /* set SRST and nIEN */
1128 hwif->OUTBSYNC(drive, drive->ctl|6, io_ports->ctl_addr); 1128 hwif->OUTBSYNC(hwif, drive->ctl | 6, io_ports->ctl_addr);
1129 /* more than enough time */ 1129 /* more than enough time */
1130 udelay(10); 1130 udelay(10);
1131 if (drive->quirk_list == 2) 1131 if (drive->quirk_list == 2)
1132 ctl = drive->ctl; /* clear SRST and nIEN */ 1132 ctl = drive->ctl; /* clear SRST and nIEN */
1133 else 1133 else
1134 ctl = drive->ctl | 2; /* clear SRST, leave nIEN */ 1134 ctl = drive->ctl | 2; /* clear SRST, leave nIEN */
1135 hwif->OUTBSYNC(drive, ctl, io_ports->ctl_addr); 1135 hwif->OUTBSYNC(hwif, ctl, io_ports->ctl_addr);
1136 /* more than enough time */ 1136 /* more than enough time */
1137 udelay(10); 1137 udelay(10);
1138 hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; 1138 hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE;