CVS commit: src/sys/dev/usb

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Sun Sep 15 15:49:38 UTC 2013

Modified Files:
        src/sys/dev/usb: usscanner.c

Log Message:
Remove unused variables


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/usscanner.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.36 src/sys/dev/usb/usscanner.c:1.37
--- src/sys/dev/usb/usscanner.c:1.36	Thu Dec 27 16:42:32 2012
+++ src/sys/dev/usb/usscanner.c	Sun Sep 15 15:49:38 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: usscanner.c,v 1.36 2012/12/27 16:42:32 skrll Exp $	*/
+/*	$NetBSD: usscanner.c,v 1.37 2013/09/15 15:49:38 martin Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.36 2012/12/27 16:42:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.37 2013/09/15 15:49:38 martin Exp $");
 
 #include "scsibus.h"
 #include <sys/param.h>
@@ -700,7 +700,6 @@ Static void
 usscanner_scsipi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req, void *arg)
 {
 	struct scsipi_xfer *xs;
-	struct scsipi_periph *periph;
 	struct usscanner_softc *sc =
 	    device_private(chan->chan_adapter->adapt_dev);
 	usbd_status err;
@@ -708,12 +707,11 @@ usscanner_scsipi_request(struct scsipi_c
 	switch (req) {
 	case ADAPTER_REQ_RUN_XFER:
 		xs = arg;
-		periph = xs->xs_periph;
 
 		DPRINTFN(8, ("%s: usscanner_scsipi_request: %d:%d "
 		    "xs=%p cmd=0x%02x datalen=%d (quirks=0x%x, poll=%d)\n",
 		    device_xname(sc->sc_dev),
-		    periph->periph_target, periph->periph_lun,
+		    xs->xs_periph->periph_target, xs->xs_periph->periph_lun,
 		    xs, xs->cmd->opcode, xs->datalen,
 		    periph->periph_quirks, xs->xs_control & XS_CTL_POLL));
 
@@ -723,9 +721,10 @@ usscanner_scsipi_request(struct scsipi_c
 		}
 
 #ifdef USSCANNER_DEBUG
-		if (periph->periph_target != USSCANNER_SCSIID_DEVICE) {
+		if (xs->xs_periph->periph_target != USSCANNER_SCSIID_DEVICE) {
 			DPRINTF(("%s: wrong SCSI ID %d\n",
-			    device_xname(sc->sc_dev), periph->periph_target));
+			    device_xname(sc->sc_dev),
+			    xs->xs_periph->periph_target));
 			xs->error = XS_DRIVER_STUFFUP;
 			goto done;
 		}