summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authordyoung <dyoung@NetBSD.org>2010-04-27 18:55:12 +0000
committerdyoung <dyoung@NetBSD.org>2010-04-27 18:55:12 +0000
commitc23dc9c098d6bfef66206495248de1b50fef9b80 (patch)
tree3a981a559fbe098e9aa43c37720ee7e407e3cd93 /sys/dev
parent082ca23a21bddd991f1fbf319ae6e1521272bfc0 (diff)
For clarity of scsidevdetached(), rename some variables: sc ->
self, dev -> child, ssc -> sc.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/scsipi/scsiconf.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/scsipi/scsiconf.c b/sys/dev/scsipi/scsiconf.c
index b436a6e60bd..4e4aa895893 100644
--- a/sys/dev/scsipi/scsiconf.c
+++ b/sys/dev/scsipi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.255 2009/11/12 19:44:17 dyoung Exp $ */
+/* $NetBSD: scsiconf.c,v 1.256 2010/04/27 18:55:12 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.255 2009/11/12 19:44:17 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.256 2010/04/27 18:55:12 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -353,18 +353,18 @@ scsibusrescan(device_t sc, const char *ifattr,
}
static void
-scsidevdetached(device_t sc, device_t dev)
+scsidevdetached(device_t self, device_t child)
{
- struct scsibus_softc *ssc = device_private(sc);
- struct scsipi_channel *chan = ssc->sc_channel;
+ struct scsibus_softc *sc = device_private(self);
+ struct scsipi_channel *chan = sc->sc_channel;
struct scsipi_periph *periph;
int target, lun;
- target = device_locator(dev, SCSIBUSCF_TARGET);
- lun = device_locator(dev, SCSIBUSCF_LUN);
+ target = device_locator(child, SCSIBUSCF_TARGET);
+ lun = device_locator(child, SCSIBUSCF_LUN);
periph = scsipi_lookup_periph(chan, target, lun);
- KASSERT(periph->periph_dev == dev);
+ KASSERT(periph->periph_dev == child);
scsipi_remove_periph(chan, periph);
free(periph, M_DEVBUF);