Tue Mar 13 06:41:54 2018 UTC ()

fix compile error (variable set but not used)


(ryo)

diff -r1.7 -r1.8 src/sys/arch/arm/omap/omap_gpio.c

--- src/sys/arch/arm/omap/Attic/omap_gpio.c 2012/11/12 18:00:37	1.7
+++ src/sys/arch/arm/omap/Attic/omap_gpio.c 2018/03/13 06:41:53	1.8

 @@ -1,14 +1,14 @@
-/*	$NetBSD: omap_gpio.c,v 1.7 2012/11/12 18:00:37 skrll Exp $ */
+/*	$NetBSD: omap_gpio.c,v 1.8 2018/03/13 06:41:53 ryo Exp $ */
 /*
  * The OMAP GPIO Controller interface is inspired by pxa2x0_gpio.c
+ *
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * 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
 @@ -28,27 +28,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_gpio.c,v 1.7 2012/11/12 18:00:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_gpio.c,v 1.8 2018/03/13 06:41:53 ryo Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <machine/intr.h>
 #include <sys/bus.h>
 #include <arm/omap/omap_tipb.h>
 #include <arm/omap/omap_gpio.h>
 #include <arm/omap/omap_gpioreg.h>
 @@ -378,70 +378,73 @@ void
 omap_gpio_intr_mask(void *cookie)
+{
 	struct omapgpio_softc *sc;
 	struct gpio_irq_handler *gh = cookie;
 	uint32_t bit;
 	u_int gpio, relnum;
 	KDASSERT(cookie != NULL);
 	gpio = gh->gh_gpio;
 	sc = device_lookup_private(&omapgpio_cd, GPIO_MODULE(gpio));
 	bit = GPIO_BIT(gpio);
 	relnum = GPIO_RELNUM(gpio);
 	__USE(relnum);
 	/* Disable interrupt generation for that gpio. */
 	bus_space_write_4(sc->sc_bust, sc->sc_bush, GPIO_CLEAR_IRQENABLE,
 	    bit);
 	sc->sc_mask &= ~bit;
+}
 void
 omap_gpio_intr_unmask(void *cookie)
+{
 	struct omapgpio_softc *sc;
 	struct gpio_irq_handler *gh = cookie;
 	uint32_t bit;
 	u_int gpio, relnum;
 	KDASSERT(cookie != NULL);
 	gpio = gh->gh_gpio;
 	sc = device_lookup_private(&omapgpio_cd, GPIO_MODULE(gpio));
 	bit = GPIO_BIT(gpio);
 	relnum = GPIO_RELNUM(gpio);
 	__USE(relnum);
 	/* Enable interrupt generation for that pin. */
 	bus_space_write_4(sc->sc_bust, sc->sc_bush, GPIO_SET_IRQENABLE,
 	    bit);
 	sc->sc_mask |= bit;
+}
 void
 omap_gpio_intr_wakeup(void *cookie, int enable)
+{
 	struct omapgpio_softc *sc;
 	struct gpio_irq_handler *gh = cookie;
 	uint32_t bit;
 	u_int gpio, relnum;
 	KDASSERT(cookie != NULL);
 	gpio = gh->gh_gpio;
 	sc = device_lookup_private(&omapgpio_cd, GPIO_MODULE(gpio));
 	bit = GPIO_BIT(gpio);
 	relnum = GPIO_RELNUM(gpio);
 	__USE(relnum);
 	if (enable)
 		bus_space_write_4(sc->sc_bust, sc->sc_bush,
 				  GPIO_SET_WAKEUPENA, bit);
 	else
 		bus_space_write_4(sc->sc_bust, sc->sc_bush,
 				  GPIO_CLEAR_WAKEUPENA, bit);
+}
 static int
 omapgpio_intr(void *arg)
+{
 	struct omapgpio_softc *sc = arg;