From 266c927d2d2cfa7215cda0904f1dd5eda7326c08 Mon Sep 17 00:00:00 2001
From: sos <sos@FreeBSD.org>
Date: Fri, 30 Apr 2004 16:21:34 +0000
Subject: Spring cleanup of macros

---
 sys/dev/ata/ata-all.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sys/dev/ata/ata-all.c')

diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index c70a858..a781e96 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -120,7 +120,7 @@ ata_probe(device_t dev)
     ch->device[SLAVE].unit = ATA_SLAVE;
     ch->device[SLAVE].mode = ATA_PIO;
     ch->dev = dev;
-    ch->state = ATA_IDLE;
+    ch->lock = ATA_IDLE;
 
     /* initialise device(s) on this channel */
     ch->locking(ch, ATA_LF_LOCK);
@@ -236,7 +236,7 @@ ata_reinit(struct ata_channel *ch)
     /* reset the HW */
     if (bootverbose)
 	ata_printf(ch, -1, "reiniting channel ..\n");
-    ATA_FORCELOCK_CH(ch, ATA_CONTROL);
+    ATA_FORCELOCK_CH(ch);
     ch->flags |= ATA_IMMEDIATE_MODE;
     ch->running = NULL;
     devices = ch->devices;
@@ -317,7 +317,7 @@ ata_suspend(device_t dev)
 	return ENXIO;
 
     ch->locking(ch, ATA_LF_LOCK);
-    ATA_SLEEPLOCK_CH(ch, ATA_CONTROL);
+    ATA_SLEEPLOCK_CH(ch);
     return 0;
 }
 
-- 
cgit v1.1