summaryrefslogtreecommitdiffstats
path: root/sys/dev/ata/ata-all.c
diff options
context:
space:
mode:
authorsos <sos@FreeBSD.org>2004-04-30 16:21:34 +0000
committersos <sos@FreeBSD.org>2004-04-30 16:21:34 +0000
commit266c927d2d2cfa7215cda0904f1dd5eda7326c08 (patch)
tree71f292f51710a31f6f3816e3a505bf019ad96e72 /sys/dev/ata/ata-all.c
parent71ff258eedd769521dfb98d6f01a83f8a735141f (diff)
downloadFreeBSD-src-266c927d2d2cfa7215cda0904f1dd5eda7326c08.zip
FreeBSD-src-266c927d2d2cfa7215cda0904f1dd5eda7326c08.tar.gz
Spring cleanup of macros
Diffstat (limited to 'sys/dev/ata/ata-all.c')
-rw-r--r--sys/dev/ata/ata-all.c6
1 files changed, 3 insertions, 3 deletions
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;
}
OpenPOWER on IntegriCloud