Mon Jan 18 13:29:37 2021 UTC ()

Trailing whitespace


(skrll)

diff -r1.31 -r1.32 src/sys/arch/arm/sunxi/sunxi_gpio.c

--- src/sys/arch/arm/sunxi/sunxi_gpio.c 2021/01/18 02:35:49	1.31
+++ src/sys/arch/arm/sunxi/sunxi_gpio.c 2021/01/18 13:29:37	1.32

 @@ -1,14 +1,14 @@
-/* $NetBSD: sunxi_gpio.c,v 1.31 2021/01/18 02:35:49 thorpej Exp $ */
+/* $NetBSD: sunxi_gpio.c,v 1.32 2021/01/18 13:29:37 skrll Exp $ */
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * IN NO EVENT SHALL THE AUTHOR 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 "opt_soc.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.31 2021/01/18 02:35:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.32 2021/01/18 13:29:37 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 #include <sys/gpio.h>
 #include <sys/bitops.h>
 #include <sys/lwp.h>
 #include <dev/fdt/fdtvar.h>
 @@ -76,27 +76,27 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c
 #define	  SUNXI_GPIO_INT_DEBOUNCE_CLK_PRESCALE	__BITS(6,4)
 #define	  SUNXI_GPIO_INT_DEBOUNCE_CLK_SEL	__BIT(0)
 #define	SUNXI_GPIO_GRP_CONFIG(bank)	(0x300 + 0x4 * (bank))
 #define	 SUNXI_GPIO_GRP_IO_BIAS_CONFIGMASK	0xf
 static const struct device_compatible_entry compat_data[] = {
 #ifdef SOC_SUN4I_A10
 	{ .compat = "allwinner,sun4i-a10-pinctrl",
 	  .data = &sun4i_a10_padconf },
 #endif
 #ifdef SOC_SUN5I_A13
 	{ .compat = "allwinner,sun5i-a13-pinctrl",
 	  .data = &sun5i_a13_padconf },
 	{ .compat = "nextthing,gr8-pinctrl",
 	  .data = &sun5i_a13_padconf },
 #endif
 #ifdef SOC_SUN6I_A31
 	{ .compat = "allwinner,sun6i-a31-pinctrl",
 	  .data = &sun6i_a31_padconf },
 	{ .compat = "allwinner,sun6i-a31-r-pinctrl",
 	  .data = &sun6i_a31_r_padconf },
 #endif
 #ifdef SOC_SUN7I_A20
 	{ .compat = "allwinner,sun7i-a20-pinctrl",
 	  .data = &sun7i_a20_padconf },
 #endif
 #ifdef SOC_SUN8I_A83T
 @@ -459,27 +459,27 @@ sunxi_gpio_intr(void *priv)
+		}
+	}
 	return ret;
+}
 static void *
 sunxi_intr_enable(struct sunxi_gpio_softc *sc,
     const struct sunxi_gpio_pins *pin_def, u_int mode, bool mpsafe,
     int (*func)(void *), void *arg)
+{
 	uint32_t val;
 	struct sunxi_gpio_eint *eint;
 	if (pin_def->functions[pin_def->eint_func] == NULL ||
 	    strcmp(pin_def->functions[pin_def->eint_func], "irq") != 0)
 		return NULL;
 	KASSERT(pin_def->eint_num < SUNXI_GPIO_MAX_EINT);
 	mutex_enter(&sc->sc_lock);
 	eint = &sc->sc_eint[pin_def->eint_bank][pin_def->eint_num];
 	if (eint->eint_func != NULL) {
 		mutex_exit(&sc->sc_lock);
 		return NULL;	/* in use */
+	}