summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorChristopher Pascoe <pascoe@cvs.openbsd.org>2007-03-20 12:44:05 +0000
committerChristopher Pascoe <pascoe@cvs.openbsd.org>2007-03-20 12:44:05 +0000
commitee7dd674a51b871a07734beda94aee0196e71330 (patch)
tree674d769ace6303d887f669ea8cacf0ca22ccc64e /sys/dev
parenta1ffed70dc4288849e39861d3823a8bcf0e0b2ad (diff)
Oops, remove some unused variables and unmangle a command name.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/atascsi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index e6367d12938..1719ce4dc09 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atascsi.c,v 1.25 2007/03/20 12:31:49 pascoe Exp $ */
+/* $OpenBSD: atascsi.c,v 1.26 2007/03/20 12:44:04 pascoe Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -383,7 +383,6 @@ atascsi_disk_inq(struct scsi_xfer *xs)
struct atascsi *as = link->adapter_softc;
struct ata_port *ap = as->as_ports[link->target];
struct ata_xfer *xa;
- int s;
xa = ata_setup_identify(ap, xs->flags & SCSI_NOSLEEP);
if (xa == NULL)
@@ -452,7 +451,6 @@ atascsi_disk_capacity(struct scsi_xfer *xs)
struct atascsi *as = link->adapter_softc;
struct ata_port *ap = as->as_ports[link->target];
struct ata_xfer *xa;
- int s;
xa = ata_setup_identify(ap, xs->flags & SCSI_NOSLEEP);
if (xa == NULL)
@@ -642,7 +640,7 @@ atascsi_stuffup(struct scsi_xfer *xs)
int
ata_exec(struct atascsi *as, struct ata_xfer *xa)
{
- switch (as->as_methods->ata_issue_cmd(xa)) {
+ switch (as->as_methods->ata_cmd(xa)) {
case ATA_COMPLETE:
case ATA_ERROR:
return (COMPLETE);