Module Name: src
Committed By: skrll
Date: Mon Apr 8 21:12:33 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c
src/sys/kern: exec_elf.c sys_descrip.c uipc_socket.c
src/sys/miscfs/fifofs: fifo_vnops.c
src/sys/ufs/ext2fs: ext2fs_vfsops.c
Log Message:
Remove some set but unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/usb/dwc_otg.c
cvs rdiff -u -r1.43 -r1.44 src/sys/kern/exec_elf.c
cvs rdiff -u -r1.27 -r1.28 src/sys/kern/sys_descrip.c
cvs rdiff -u -r1.214 -r1.215 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.72 -r1.73 src/sys/miscfs/fifofs/fifo_vnops.c
cvs rdiff -u -r1.168 -r1.169 src/sys/ufs/ext2fs/ext2fs_vfsops.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/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.48 src/sys/dev/usb/dwc_otg.c:1.49
--- src/sys/dev/usb/dwc_otg.c:1.48 Sat Mar 16 12:05:02 2013
+++ src/sys/dev/usb/dwc_otg.c Mon Apr 8 21:12:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.48 2013/03/16 12:05:02 skrll Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.49 2013/04/08 21:12:33 skrll Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.48 2013/03/16 12:05:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.49 2013/04/08 21:12:33 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2917,7 +2917,6 @@ dwc_otg_host_data_tx(struct dwc_otg_td *
uint32_t count;
uint32_t hcint;
uint32_t hcchar;
- uint8_t ep_type;
if (dwc_otg_host_channel_alloc(td))
return 1; /* busy */
@@ -2925,9 +2924,6 @@ dwc_otg_host_data_tx(struct dwc_otg_td *
/* get pointer to softc */
sc = DWC_OTG_TD2SC(td);
- ep_type = ((td->hcchar &
- HCCHAR_EPTYPE_MASK) >> HCCHAR_EPTYPE_SHIFT);
-
hcint = sc->sc_chan_state[td->channel].hcint;
DPRINTF("CH=%d ST=%d HCINT=0x%08x HCCHAR=0x%08x HCTSIZ=0x%08x\n",
@@ -3991,7 +3987,6 @@ dwc_otg_rhc(void *addr)
{
struct dwc_otg_softc *sc = addr;
usbd_xfer_handle xfer;
- usbd_pipe_handle pipe;
u_char *p;
DPRINTF("\n");
@@ -4005,8 +4000,6 @@ dwc_otg_rhc(void *addr)
}
/* set port bit */
- pipe = xfer->pipe;
-
p = KERNADDR(&xfer->dmabuf, 0);
p[0] = 0x02; /* we only have one port (1 << 1) */
Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.43 src/sys/kern/exec_elf.c:1.44
--- src/sys/kern/exec_elf.c:1.43 Sun Aug 5 01:43:58 2012
+++ src/sys/kern/exec_elf.c Mon Apr 8 21:12:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.43 2012/08/05 01:43:58 matt Exp $ */
+/* $NetBSD: exec_elf.c,v 1.44 2013/04/08 21:12:33 skrll Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.43 2012/08/05 01:43:58 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.44 2013/04/08 21:12:33 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -665,7 +665,6 @@ exec_elf_makecmds(struct lwp *l, struct
int error, i, nload;
char *interp = NULL;
u_long phsize;
- struct proc *p;
struct elf_args *ap = NULL;
bool is_dyn;
@@ -691,7 +690,6 @@ exec_elf_makecmds(struct lwp *l, struct
* Allocate space to hold all the program headers, and read them
* from the file
*/
- p = l->l_proc;
phsize = eh->e_phnum * sizeof(Elf_Phdr);
ph = kmem_alloc(phsize, KM_SLEEP);
Index: src/sys/kern/sys_descrip.c
diff -u src/sys/kern/sys_descrip.c:1.27 src/sys/kern/sys_descrip.c:1.28
--- src/sys/kern/sys_descrip.c:1.27 Sun Aug 5 04:26:10 2012
+++ src/sys/kern/sys_descrip.c Mon Apr 8 21:12:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_descrip.c,v 1.27 2012/08/05 04:26:10 riastradh Exp $ */
+/* $NetBSD: sys_descrip.c,v 1.28 2013/04/08 21:12:33 skrll Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.27 2012/08/05 04:26:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.28 2013/04/08 21:12:33 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -601,7 +601,6 @@ sys_flock(struct lwp *l, const struct sy
file_t *fp;
vnode_t *vp;
struct flock lf;
- proc_t *p;
fd = SCARG(uap, fd);
how = SCARG(uap, how);
@@ -639,7 +638,6 @@ sys_flock(struct lwp *l, const struct sy
}
atomic_or_uint(&fp->f_flag, FHASLOCK);
- p = curproc;
if (how & LOCK_NB) {
error = VOP_ADVLOCK(vp, fp, F_SETLK, &lf, F_FLOCK);
} else {
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.214 src/sys/kern/uipc_socket.c:1.215
--- src/sys/kern/uipc_socket.c:1.214 Thu Mar 14 19:13:17 2013
+++ src/sys/kern/uipc_socket.c Mon Apr 8 21:12:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.214 2013/03/14 19:13:17 gdt Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.215 2013/04/08 21:12:33 skrll Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.214 2013/03/14 19:13:17 gdt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.215 2013/04/08 21:12:33 skrll Exp $");
#include "opt_compat_netbsd.h"
#include "opt_sock_counters.h"
@@ -877,12 +877,10 @@ sosend(struct socket *so, struct mbuf *a
struct mbuf *control, int flags, struct lwp *l)
{
struct mbuf **mp, *m;
- struct proc *p;
long space, len, resid, clen, mlen;
int error, s, dontroute, atomic;
short wakeup_state = 0;
- p = l->l_proc;
clen = 0;
/*
Index: src/sys/miscfs/fifofs/fifo_vnops.c
diff -u src/sys/miscfs/fifofs/fifo_vnops.c:1.72 src/sys/miscfs/fifofs/fifo_vnops.c:1.73
--- src/sys/miscfs/fifofs/fifo_vnops.c:1.72 Wed Dec 21 15:27:50 2011
+++ src/sys/miscfs/fifofs/fifo_vnops.c Mon Apr 8 21:12:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fifo_vnops.c,v 1.72 2011/12/21 15:27:50 christos Exp $ */
+/* $NetBSD: fifo_vnops.c,v 1.73 2013/04/08 21:12:33 skrll Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.72 2011/12/21 15:27:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.73 2013/04/08 21:12:33 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,12 +128,10 @@ fifo_open(void *v)
struct lwp *l = curlwp;
struct vnode *vp;
struct fifoinfo *fip;
- struct proc *p;
struct socket *rso, *wso;
int error;
vp = ap->a_vp;
- p = l->l_proc;
if ((fip = vp->v_fifoinfo) == NULL) {
fip = kmem_alloc(sizeof(*fip), KM_SLEEP);
Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.168 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.169
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.168 Thu Dec 20 08:03:44 2012
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Mon Apr 8 21:12:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.168 2012/12/20 08:03:44 hannken Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.169 2013/04/08 21:12:33 skrll Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.168 2012/12/20 08:03:44 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.169 2013/04/08 21:12:33 skrll Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -664,10 +664,8 @@ ext2fs_mountfs(struct vnode *devvp, stru
dev_t dev;
int error, i, ronly;
kauth_cred_t cred;
- struct proc *p;
dev = devvp->v_rdev;
- p = l ? l->l_proc : NULL;
cred = l ? l->l_cred : NOCRED;
/* Flush out any old buffers remaining from a previous use. */
