CVS commit: src/sys/arch/x86/pci

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Thu Oct 17 21:12:24 UTC 2013

Modified Files:
        src/sys/arch/x86/pci: fwhrng.c pci_machdep.c

Log Message:
remove set but unused variables


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/pci/fwhrng.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/x86/pci/pci_machdep.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/arch/x86/pci/fwhrng.c
diff -u src/sys/arch/x86/pci/fwhrng.c:1.5 src/sys/arch/x86/pci/fwhrng.c:1.6
--- src/sys/arch/x86/pci/fwhrng.c:1.5	Thu Feb  2 14:43:01 2012
+++ src/sys/arch/x86/pci/fwhrng.c	Thu Oct 17 17:12:24 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: fwhrng.c,v 1.5 2012/02/02 19:43:01 tls Exp $	*/
+/*	$NetBSD: fwhrng.c,v 1.6 2013/10/17 21:12:24 christos Exp $	*/
 
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.5 2012/02/02 19:43:01 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.6 2013/10/17 21:12:24 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,11 +71,8 @@ fwhrng_match(device_t parent, cfdata_t m
 {
 	bus_space_tag_t bst;
 	bus_space_handle_t bsh;
-	int ret;
 	uint8_t id0, id1, data0, data1;
 
-	ret = 0;
-
 	bst = x86_bus_space_mem;
 
 	/* read chip ID */

Index: src/sys/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.61 src/sys/arch/x86/pci/pci_machdep.c:1.62
--- src/sys/arch/x86/pci/pci_machdep.c:1.61	Sat Oct  5 07:20:34 2013
+++ src/sys/arch/x86/pci/pci_machdep.c	Thu Oct 17 17:12:24 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.61 2013/10/05 11:20:34 gson Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.62 2013/10/17 21:12:24 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.61 2013/10/05 11:20:34 gson Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.62 2013/10/17 21:12:24 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -309,9 +309,7 @@ pci_conf_lock(struct pci_conf_lock *ocl,
 static void
 pci_conf_unlock(struct pci_conf_lock *ocl)
 {
-	uint32_t sel;
-
-	sel = atomic_cas_32_ni(&cl->cl_sel, cl->cl_sel, ocl->cl_sel);
+	atomic_cas_32_ni(&cl->cl_sel, cl->cl_sel, ocl->cl_sel);
 	pci_conf_select(ocl->cl_sel);
 	if (ocl->cl_cpuno != cl->cl_cpuno)
 		atomic_cas_32(&cl->cl_cpuno, cl->cl_cpuno, ocl->cl_cpuno);