Module Name: src
Committed By: mrg
Date: Wed Mar 12 22:21:07 UTC 2014
Modified Files:
src/sys/arch/evbmips/alchemy: dbau1550.c
src/sys/arch/mips/ralink: ralink_gpio.c
Log Message:
remove some dead code, avoid set but unused variables.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/alchemy/dbau1550.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/ralink/ralink_gpio.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/evbmips/alchemy/dbau1550.c
diff -u src/sys/arch/evbmips/alchemy/dbau1550.c:1.12 src/sys/arch/evbmips/alchemy/dbau1550.c:1.13
--- src/sys/arch/evbmips/alchemy/dbau1550.c:1.12 Sun Jul 10 00:03:52 2011
+++ src/sys/arch/evbmips/alchemy/dbau1550.c Wed Mar 12 22:21:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dbau1550.c,v 1.12 2011/07/10 00:03:52 matt Exp $ */
+/* $NetBSD: dbau1550.c,v 1.13 2014/03/12 22:21:07 mrg Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.12 2011/07/10 00:03:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.13 2014/03/12 22:21:07 mrg Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -320,18 +320,8 @@ dbau1550_slot_enable(int slot)
void
dbau1550_slot_disable(int slot)
{
- int shift;
uint16_t status;
- switch (slot) {
- case 0:
- shift = DBAU1550_PCMCIA_PC0_SHIFT;
- break;
- case 1:
- shift = DBAU1550_PCMCIA_PC1_SHIFT;
- break;
- }
-
status = GET16(DBAU1550_PCMCIA);
status &= ~(DBAU1550_PCMCIA_MASK);
PUT16(DBAU1550_PCMCIA, status);
Index: src/sys/arch/mips/ralink/ralink_gpio.c
diff -u src/sys/arch/mips/ralink/ralink_gpio.c:1.4 src/sys/arch/mips/ralink/ralink_gpio.c:1.5
--- src/sys/arch/mips/ralink/ralink_gpio.c:1.4 Sat Oct 27 17:18:02 2012
+++ src/sys/arch/mips/ralink/ralink_gpio.c Wed Mar 12 22:21:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_gpio.c,v 1.4 2012/10/27 17:18:02 chs Exp $ */
+/* $NetBSD: ralink_gpio.c,v 1.5 2014/03/12 22:21:07 mrg Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ra_gpio.c -- Ralink 3052 gpio driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_gpio.c,v 1.4 2012/10/27 17:18:02 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_gpio.c,v 1.5 2014/03/12 22:21:07 mrg Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -665,7 +665,6 @@ ra_gpio_attach(device_t parent, device_t
static void
ra_gpio_pin_init(ra_gpio_softc_t *sc, int pin)
{
- u_int gpio_mode;
uint32_t r;
sc->sc_pins[pin].pin_caps = 0;
@@ -692,7 +691,6 @@ ra_gpio_pin_init(ra_gpio_softc_t *sc, in
sc->sc_pins[pin].pin_caps = GPIO_PIN_INPUT | GPIO_PIN_OUTPUT |
GPIO_PIN_INVIN | GPIO_PIN_INVOUT;
sc->sc_pins[pin].pin_state = GPIO_PIN_INPUT;
- gpio_mode = 0;
#if defined(SLICKROCK)
r = sy_read(sc, RA_SYSCTL_GPIOMODE);
@@ -706,7 +704,9 @@ ra_gpio_pin_init(ra_gpio_softc_t *sc, in
* GPIO0 doesn't have an associated MODE register.
*/
if (pin != 0) {
- for (gpio_mode=0; gpio_mode < GPIO_MODE_SETTINGS; gpio_mode++) {
+ u_int gpio_mode = 0;
+
+ for (gpio_mode; gpio_mode < GPIO_MODE_SETTINGS; gpio_mode++) {
if (pin <= pin_share[gpio_mode]) {
r = sy_read(sc, RA_SYSCTL_GPIOMODE);
if (10 == pin) {
