Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/scsipi For clarity of scsidevdetached(), rename some...



details:   https://anonhg.NetBSD.org/src/rev/7e197851d612
branches:  trunk
changeset: 754323:7e197851d612
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Tue Apr 27 18:55:12 2010 +0000

description:
For clarity of scsidevdetached(), rename some variables:  sc ->
self, dev -> child, ssc -> sc.

diffstat:

 sys/dev/scsipi/scsiconf.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (43 lines):

diff -r 6d126dc545ff -r 7e197851d612 sys/dev/scsipi/scsiconf.c
--- a/sys/dev/scsipi/scsiconf.c Tue Apr 27 18:52:45 2010 +0000
+++ b/sys/dev/scsipi/scsiconf.c Tue Apr 27 18:55:12 2010 +0000
@@ -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 @@
 }
 
 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);



Home | Main Index | Thread Index | Old Index