summaryrefslogtreecommitdiff
path: root/sys/scsi
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2011-04-27 09:09:37 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2011-04-27 09:09:37 +0000
commit333f0c314bba106fa93dcdf4b35e0a33021baba6 (patch)
treeed53d727cd3a1a5d6ef482657ce40c483c488950 /sys/scsi
parent95640249ecc34fe6b25f73b20fb66e7a636ea7b3 (diff)
whitespace fixes.
Diffstat (limited to 'sys/scsi')
-rw-r--r--sys/scsi/mpath_emc.c30
-rw-r--r--sys/scsi/mpath_rdac.c11
-rw-r--r--sys/scsi/mpath_sym.c10
3 files changed, 25 insertions, 26 deletions
diff --git a/sys/scsi/mpath_emc.c b/sys/scsi/mpath_emc.c
index 0589a7dbf9f..a338e6bf9d6 100644
--- a/sys/scsi/mpath_emc.c
+++ b/sys/scsi/mpath_emc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpath_emc.c,v 1.2 2011/04/27 07:14:50 dlg Exp $ */
+/* $OpenBSD: mpath_emc.c,v 1.3 2011/04/27 09:09:36 dlg Exp $ */
/*
* Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -21,7 +21,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
-#include <sys/kernel.h>
+#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/proc.h>
@@ -193,14 +193,14 @@ emc_activate(struct device *self, int act)
switch (act) {
case DVACT_ACTIVATE:
case DVACT_SUSPEND:
- case DVACT_RESUME:
- break;
+ case DVACT_RESUME:
+ break;
case DVACT_DEACTIVATE:
if (sc->sc_path.p_dev != NULL)
mpath_path_detach(&sc->sc_path);
break;
}
- return (rv);
+ return (rv);
}
void
@@ -253,17 +253,17 @@ emc_inquiry(struct emc_softc *sc, char *model, char *serial)
goto done;
}
- cdb = (struct scsi_inquiry *)xs->cmd;
- cdb->opcode = INQUIRY;
- _lto2b(length, cdb->length);
+ cdb = (struct scsi_inquiry *)xs->cmd;
+ cdb->opcode = INQUIRY;
+ _lto2b(length, cdb->length);
- xs->cmdlen = sizeof(*cdb);
- xs->flags |= SCSI_DATA_IN;
- xs->data = buffer;
- xs->datalen = length;
+ xs->cmdlen = sizeof(*cdb);
+ xs->flags |= SCSI_DATA_IN;
+ xs->data = buffer;
+ xs->datalen = length;
- error = scsi_xs_sync(xs);
- scsi_xs_put(xs);
+ error = scsi_xs_sync(xs);
+ scsi_xs_put(xs);
if (error != 0)
goto done;
@@ -309,5 +309,5 @@ emc_sp_info(struct emc_softc *sc)
error = 0;
done:
dma_free(pg, sizeof(*pg));
- return (error);
+ return (error);
}
diff --git a/sys/scsi/mpath_rdac.c b/sys/scsi/mpath_rdac.c
index 6f530d968de..e1c79f3e46d 100644
--- a/sys/scsi/mpath_rdac.c
+++ b/sys/scsi/mpath_rdac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpath_rdac.c,v 1.2 2011/04/27 07:14:50 dlg Exp $ */
+/* $OpenBSD: mpath_rdac.c,v 1.3 2011/04/27 09:09:36 dlg Exp $ */
/*
* Copyright (c) 2010 David Gwynne <dlg@openbsd.org>
@@ -21,7 +21,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
-#include <sys/kernel.h>
+#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/proc.h>
@@ -233,15 +233,14 @@ rdac_activate(struct device *self, int act)
switch (act) {
case DVACT_ACTIVATE:
case DVACT_SUSPEND:
- case DVACT_RESUME:
- break;
+ case DVACT_RESUME:
+ break;
case DVACT_DEACTIVATE:
if (sc->sc_path.p_dev != NULL)
mpath_path_detach(&sc->sc_path);
break;
}
- return (rv);
-
+ return (rv);
}
void
diff --git a/sys/scsi/mpath_sym.c b/sys/scsi/mpath_sym.c
index 8eb5ecaefdf..434f9753df3 100644
--- a/sys/scsi/mpath_sym.c
+++ b/sys/scsi/mpath_sym.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpath_sym.c,v 1.1 2011/04/05 14:25:42 dlg Exp $ */
+/* $OpenBSD: mpath_sym.c,v 1.2 2011/04/27 09:09:36 dlg Exp $ */
/*
* Copyright (c) 2010 David Gwynne <dlg@openbsd.org>
@@ -19,7 +19,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
-#include <sys/kernel.h>
+#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/proc.h>
@@ -163,17 +163,17 @@ sym_mpath_start(struct scsi_xfer *xs)
int
sym_mpath_checksense(struct scsi_xfer *xs)
{
- return (0);
+ return (0);
}
int
sym_mpath_online(struct scsi_link *link)
{
- return (0);
+ return (0);
}
int
sym_mpath_offline(struct scsi_link *link)
{
- return (0);
+ return (0);
}