From 211d4362597aee676ecea315377d5cb13da26bb5 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 4 Jan 2013 03:23:10 +0100 Subject: [PATCH] kernel: Remove some unused variables in gpio/spic/cardbus/ndis. --- sys/dev/misc/gpio/gpio.c | 4 ---- sys/dev/misc/spic/spic.c | 4 ---- sys/dev/pccard/cardbus/cardbus.c | 2 -- sys/emulation/ndis/subr_ndis.c | 6 ------ sys/emulation/ndis/subr_ntoskrnl.c | 2 -- sys/emulation/ndis/subr_u4bd.c | 3 --- 6 files changed, 21 deletions(-) diff --git a/sys/dev/misc/gpio/gpio.c b/sys/dev/misc/gpio/gpio.c index c91301dd30..64bb9cb7aa 100644 --- a/sys/dev/misc/gpio/gpio.c +++ b/sys/dev/misc/gpio/gpio.c @@ -298,12 +298,10 @@ gpio_pin_caps(struct gpio *gp, struct gpio_mapping *map, int pin) static int gpio_open(struct dev_open_args *ap) { - struct gpio *gp; gpio_pin_t *pin; cdev_t dev; dev = ap->a_head.a_dev; - gp = dev->si_drv1; pin = dev->si_drv2; if (pin->pin_opened || pin->pin_mapped) @@ -317,12 +315,10 @@ gpio_open(struct dev_open_args *ap) static int gpio_close(struct dev_close_args *ap) { - struct gpio *gp; gpio_pin_t *pin; cdev_t dev; dev = ap->a_head.a_dev; - gp = dev->si_drv1; pin = dev->si_drv2; if (pin->pin_opened) diff --git a/sys/dev/misc/spic/spic.c b/sys/dev/misc/spic/spic.c index 3af022cc54..5c9488ec29 100644 --- a/sys/dev/misc/spic/spic.c +++ b/sys/dev/misc/spic/spic.c @@ -512,10 +512,6 @@ spicread(struct dev_read_args *ap) static int spicioctl(struct dev_ioctl_args *ap) { - struct spic_softc *sc; - - sc = devclass_get_softc(spic_devclass, 0); - return EIO; } diff --git a/sys/dev/pccard/cardbus/cardbus.c b/sys/dev/pccard/cardbus/cardbus.c index b0a95949c1..3b2d634b84 100644 --- a/sys/dev/pccard/cardbus/cardbus.c +++ b/sys/dev/pccard/cardbus/cardbus.c @@ -320,10 +320,8 @@ static int cardbus_read_ivar(device_t cbdev, device_t child, int which, uintptr_t *result) { struct cardbus_devinfo *dinfo; - pcicfgregs *cfg; dinfo = device_get_ivars(child); - cfg = &dinfo->pci.cfg; switch (which) { case PCI_IVAR_ETHADDR: diff --git a/sys/emulation/ndis/subr_ndis.c b/sys/emulation/ndis/subr_ndis.c index fcd37c92f9..4670c2e383 100644 --- a/sys/emulation/ndis/subr_ndis.c +++ b/sys/emulation/ndis/subr_ndis.c @@ -1091,12 +1091,6 @@ static void NdisMInitializeTimer(ndis_miniport_timer *timer, ndis_handle handle, ndis_timer_function func, void *ctx) { - ndis_miniport_block *block; - struct ndis_softc *sc; - - block = (ndis_miniport_block *)handle; - sc = device_get_softc(block->nmb_physdeviceobj->do_devext); - /* Save the driver's funcptr and context */ timer->nmt_timerfunc = func; diff --git a/sys/emulation/ndis/subr_ntoskrnl.c b/sys/emulation/ndis/subr_ntoskrnl.c index c622de2cb7..0048f105e2 100644 --- a/sys/emulation/ndis/subr_ntoskrnl.c +++ b/sys/emulation/ndis/subr_ntoskrnl.c @@ -3177,7 +3177,6 @@ KeSetEvent(nt_kevent *kevent, uint32_t increment, uint8_t kwait) uint32_t prevstate; wait_block *w; nt_dispatch_header *dh; - struct thread *td; wb_ext *we; lockmgr(&ntoskrnl_dispatchlock, LK_EXCLUSIVE); @@ -3204,7 +3203,6 @@ KeSetEvent(nt_kevent *kevent, uint32_t increment, uint8_t kwait) w = CONTAINING_RECORD(dh->dh_waitlisthead.nle_flink, wait_block, wb_waitlist); we = w->wb_ext; - td = we->we_td; if (kevent->k_header.dh_type == DISP_TYPE_NOTIFICATION_EVENT || w->wb_waittype == WAITTYPE_ALL) { if (prevstate == 0) { diff --git a/sys/emulation/ndis/subr_u4bd.c b/sys/emulation/ndis/subr_u4bd.c index 5b8fc96f96..909c774e9c 100644 --- a/sys/emulation/ndis/subr_u4bd.c +++ b/sys/emulation/ndis/subr_u4bd.c @@ -1093,7 +1093,6 @@ usbd_xfertask(device_object *dobj, void *arg) { int error; irp *ip; - device_t dev; list_entry *l; struct ndis_softc *sc = arg; struct ndisusb_xferdone *nd; @@ -1104,8 +1103,6 @@ usbd_xfertask(device_object *dobj, void *arg) usb_error_t status; void *priv; - dev = sc->ndis_dev; - if (IsListEmpty(&sc->ndisusb_xferdonelist)) return; -- 2.41.0