Thu Sep 17 20:21:54 2009 UTC ()

As Jonathan Kollasch points out, elansc_attach() does not actually
use gba after filling it out.  Delete it.


(dyoung)

diff -r1.42 -r1.43 src/sys/arch/i386/pci/elan520.c

--- src/sys/arch/i386/pci/elan520.c 2009/04/29 23:50:53	1.42
+++ src/sys/arch/i386/pci/elan520.c 2009/09/17 20:21:54	1.43

 @@ -1,14 +1,14 @@
-/*	$NetBSD: elan520.c,v 1.42 2009/04/29 23:50:53 dyoung Exp $	*/
+/*	$NetBSD: elan520.c,v 1.43 2009/09/17 20:21:54 dyoung Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -30,27 +30,27 @@
  */
 /*
  * Device driver for the AMD Elan SC520 System Controller.  This attaches
  * where the "pchb" driver might normally attach, and provides support for
  * extra features on the SC520, such as the watchdog timer and GPIO.
+ *
  * Information about the GP bus echo bug work-around is from code posted
  * to the "soekris-tech" mailing list by Jasper Wallace.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.42 2009/04/29 23:50:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.43 2009/09/17 20:21:54 dyoung Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/device.h>
 #include <sys/gpio.h>
 #include <sys/mutex.h>
 #include <sys/wdog.h>
 #include <sys/reboot.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 @@ -1252,27 +1252,26 @@ elanpar_detach(device_t self, int flags)
 	elanpar_intr_disestablish(sc);
 	return 0;
+}
 static void
 elansc_attach(device_t parent, device_t self, void *aux)
+{
 	struct elansc_softc *sc = device_private(self);
 	struct pcibus_attach_args *pba = aux;
 	uint16_t rev;
 	uint8_t cpuctl, picicr, ressta;
 #if NGPIO > 0
 	struct gpiobus_attach_args gba;
 	int pin, reg, shift;
 	uint16_t data;
 #endif
 	sc->sc_dev = self;
 	sc->sc_pc = pba->pba_pc;
 	sc->sc_pciflags = pba->pba_flags;
 	sc->sc_dmat = pba->pba_dmat;
 	sc->sc_dmat64 = pba->pba_dmat64;
 	sc->sc_tag = pci_make_tag(sc->sc_pc, 0, 0, 0);
 	aprint_naive(": System Controller\n");
 @@ -1377,30 +1376,26 @@ elansc_attach(device_t parent, device_t
 			sc->sc_gpio_pins[pin].pin_flags = GPIO_PIN_OUTPUT;
 		if (elansc_gpio_pin_read(sc, pin) == 0)
 			sc->sc_gpio_pins[pin].pin_state = GPIO_PIN_LOW;
 		else
 			sc->sc_gpio_pins[pin].pin_state = GPIO_PIN_HIGH;
+	}
 	/* Create controller tag */
 	sc->sc_gpio_gc.gp_cookie = sc;
 	sc->sc_gpio_gc.gp_pin_read = elansc_gpio_pin_read;
 	sc->sc_gpio_gc.gp_pin_write = elansc_gpio_pin_write;
 	sc->sc_gpio_gc.gp_pin_ctl = elansc_gpio_pin_ctl;
 	gba.gba_gc = &sc->sc_gpio_gc;
 	gba.gba_pins = sc->sc_gpio_pins;
 	gba.gba_npins = ELANSC_PIO_NPINS;
 #endif /* NGPIO */
 	elansc_rescan(sc->sc_dev, "elanparbus", NULL);
 	elansc_rescan(sc->sc_dev, "elanpexbus", NULL);
 	elansc_rescan(sc->sc_dev, "gpiobus", NULL);
 	/*
 	 * Hook up the watchdog timer.
 	 */
 	sc->sc_smw.smw_name = device_xname(sc->sc_dev);
 	sc->sc_smw.smw_cookie = sc;
 	sc->sc_smw.smw_setmode = elansc_wdog_setmode;
 	sc->sc_smw.smw_tickle = elansc_wdog_tickle;