Remove unneeded scope declarations that shadows existing ones. krw@ ok

4 files changed, 6 insertions, 28 deletions

diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index c68a4b01bb8..a36164e7b76 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx.c,v 1.40 2007/09/07 17:58:39 krw Exp $	*/
+/*	$OpenBSD: aic79xx.c,v 1.41 2007/10/20 22:44:00 fgsch Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -1617,7 +1617,6 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
 		if ((ahd->bugs & AHD_CLRLQO_AUTOCLR_BUG) != 0)
 			ahd_outb(ahd, CLRLQOINT1, 0);
 	} else if ((status & SELTO) != 0) {
-		u_int  scbid;
 
 		/* Stop the selection */
 		ahd_outb(ahd, SCSISEQ0, 0);
@@ -1727,10 +1726,6 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
 		switch (busfreetime) {
 		case BUSFREE_DFF0:
 		case BUSFREE_DFF1:
-		{
-			u_int	scbid;
-			struct	scb *scb;
-
 			mode = busfreetime == BUSFREE_DFF0
 			     ? AHD_MODE_DFF0 : AHD_MODE_DFF1;
 			ahd_set_modes(ahd, mode, mode);
@@ -1745,7 +1740,6 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
 				packetized = (scb->flags & SCB_PACKETIZED) != 0;
 			clear_fifo = 1;
 			break;
-		}
 		case BUSFREE_LQO:
 			clear_fifo = 0;
 			packetized = 1;
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 3d47791d3c4..a6390248bd5 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxx.c,v 1.77 2007/09/07 17:58:39 krw Exp $	*/
+/*	$OpenBSD: aic7xxx.c,v 1.78 2007/10/20 22:44:00 fgsch Exp $	*/
 /*	$NetBSD: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aic7xxx.c,v 1.77 2007/09/07 17:58:39 krw Exp $
+ * $Id: aic7xxx.c,v 1.78 2007/10/20 22:44:00 fgsch Exp $
  */
 /*
  * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
@@ -463,6 +463,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 {
 	struct scb *scb;
 	struct ahc_devinfo devinfo;
+	u_int scb_index;
 	
 	ahc_fetch_devinfo(ahc, &devinfo);
 
@@ -476,7 +477,6 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 	switch (intstat & SEQINT_MASK) {
 	case BAD_STATUS:
 	{
-		u_int  scb_index;
 		struct hardware_scb *hscb;
 
 		/*
@@ -744,8 +744,6 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 		 * loop.
 		 */
 		if (ahc->msg_type == MSG_TYPE_NONE) {
-			struct scb *scb;
-			u_int scb_index;
 			u_int bus_phase;
 
 			bus_phase = ahc_inb(ahc, SCSISIGI) & PHASE_MASK;
@@ -848,9 +846,6 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
 				ahc_outb(ahc, SXFRCTL1,
 					 ahc_inb(ahc, SXFRCTL1) & ~BITBUCKET);
 				if (wait == 0) {
-					struct	scb *scb;
-					u_int	scb_index;
-
 					ahc_print_devinfo(ahc, &devinfo);
 					printf("Unable to clear parity error.  "
 					       "Resetting bus.\n");
@@ -4070,8 +4065,6 @@ ahc_reset(struct ahc_softc *ahc, int reinit)
 	ahc_pause(ahc);
 	sxfrctl1_b = 0;
 	if ((ahc->chip & AHC_CHIPID_MASK) == AHC_AIC7770) {
-		u_int sblkctl;
-
 		/*
 		 * Save channel B's settings in case this chip
 		 * is setup for TWIN channel operation.
@@ -4133,8 +4126,6 @@ ahc_reset(struct ahc_softc *ahc, int reinit)
 	 * by turning it on.
 	 */
 	if ((ahc->features & AHC_TWIN) != 0) {
-		u_int sblkctl;
-
 		sblkctl = ahc_inb(ahc, SBLKCTL);
 		ahc_outb(ahc, SBLKCTL, sblkctl | SELBUSB);
 		ahc_outb(ahc, SXFRCTL1, sxfrctl1_b);
@@ -5936,8 +5927,6 @@ ahc_reset_channel(struct ahc_softc *ahc, char channel, int initiate_reset)
 		if (ahc->enabled_targets[target] == NULL)
 			continue;
 		for (initiator = 0; initiator <= max_scsiid; initiator++) {
-			struct ahc_devinfo devinfo;
-
 			ahc_compile_devinfo(&devinfo, target, initiator,
 					    CAM_LUN_WILDCARD,
 					    channel, ROLE_UNKNOWN);
diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c
index 110f4eb8f1f..5631122e262 100644
--- a/sys/dev/pci/ahd_pci.c
+++ b/sys/dev/pci/ahd_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahd_pci.c,v 1.15 2006/10/19 10:55:56 tom Exp $	*/
+/*	$OpenBSD: ahd_pci.c,v 1.16 2007/10/20 22:44:01 fgsch Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -482,8 +482,6 @@ ahd_pci_attach(struct device *parent, struct device *self, void *aux)
 	 * 64bit bus (PCI64BIT set in devconfig).
 	 */
 	if ((ahd->flags & (AHD_39BIT_ADDRESSING|AHD_64BIT_ADDRESSING)) != 0) {
-		pcireg_t devconfig;
-
 		if (bootverbose)
 			printf("%s: Enabling 39Bit Addressing\n",
 			       ahd_name(ahd));
@@ -615,8 +613,6 @@ ahd_pci_test_register_access(struct ahd_softc *ahd)
 		goto fail;
 
 	if ((ahd_inb(ahd, INTSTAT) & PCIINT) != 0) {
-		u_int targpcistat;
-
 		ahd_set_modes(ahd, AHD_MODE_CFG, AHD_MODE_CFG);
 		targpcistat = ahd_inb(ahd, TARGPCISTAT);
 		if ((targpcistat & STA) != 0)
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index d7565765ddc..355e3b15d87 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.51 2007/10/11 18:33:15 deraadt Exp $ */
+/*	$OpenBSD: ugen.c,v 1.52 2007/10/20 22:44:01 fgsch Exp $ */
 /*	$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -1206,7 +1206,6 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 		struct iovec iov;
 		struct uio uio;
 		void *ptr = 0;
-		usbd_status err;
 		int error = 0;
 
 		if (!(flag & FWRITE))