Wed Sep 25 16:49:37 2019 UTC ()
KNF


(skrll)
diff -r1.21 -r1.22 src/sys/arch/arm/broadcom/bcm2835_intr.c
cvs diff -r1.21 -r1.22 src/sys/arch/arm/broadcom/bcm2835_intr.c (expand / switch to unified diff)

--- src/sys/arch/arm/broadcom/bcm2835_intr.c 2019/09/25 16:48:06 1.21
+++ src/sys/arch/arm/broadcom/bcm2835_intr.c 2019/09/25 16:49:37 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: bcm2835_intr.c,v 1.21 2019/09/25 16:48:06 skrll Exp $ */ 1/* $NetBSD: bcm2835_intr.c,v 1.22 2019/09/25 16:49:37 skrll Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2012, 2015 The NetBSD Foundation, Inc. 4 * Copyright (c) 2012, 2015 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Nick Hudson 8 * by Nick Hudson
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.21 2019/09/25 16:48:06 skrll Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.22 2019/09/25 16:49:37 skrll Exp $");
34 34
35#define _INTR_PRIVATE 35#define _INTR_PRIVATE
36 36
37#include "opt_bcm283x.h" 37#include "opt_bcm283x.h"
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40#include <sys/bus.h> 40#include <sys/bus.h>
41#include <sys/cpu.h> 41#include <sys/cpu.h>
42#include <sys/device.h> 42#include <sys/device.h>
43#include <sys/kernel.h> 43#include <sys/kernel.h>
44#include <sys/kmem.h> 44#include <sys/kmem.h>
45#include <sys/proc.h> 45#include <sys/proc.h>
46 46
@@ -695,26 +695,27 @@ bcm2836mp_intr_init(void *priv, struct c @@ -695,26 +695,27 @@ bcm2836mp_intr_init(void *priv, struct c
695 695
696 const int irq = BCM2836_INT_BASECPUN(cpuid) + bip->bi_irq; 696 const int irq = BCM2836_INT_BASECPUN(cpuid) + bip->bi_irq;
697 void *ih = intr_establish(irq, bip->bi_ipl, 697 void *ih = intr_establish(irq, bip->bi_ipl,
698 IST_LEVEL | bip->bi_flags, bip->bi_func, bip->bi_arg); 698 IST_LEVEL | bip->bi_flags, bip->bi_func, bip->bi_arg);
699 699
700 bip->bi_ihs[cpuid] = ih; 700 bip->bi_ihs[cpuid] = ih;
701 } 701 }
702#endif 702#endif
703} 703}
704 704
705static int 705static int
706bcm2836mp_icu_fdt_decode_irq(u_int *specifier) 706bcm2836mp_icu_fdt_decode_irq(u_int *specifier)
707{ 707{
 708
708 if (!specifier) 709 if (!specifier)
709 return -1; 710 return -1;
710 return be32toh(specifier[0]); 711 return be32toh(specifier[0]);
711} 712}
712 713
713static void * 714static void *
714bcm2836mp_icu_fdt_establish(device_t dev, u_int *specifier, int ipl, int flags, 715bcm2836mp_icu_fdt_establish(device_t dev, u_int *specifier, int ipl, int flags,
715 int (*func)(void *), void *arg) 716 int (*func)(void *), void *arg)
716{ 717{
717 int iflags = (flags & FDT_INTR_MPSAFE) ? IST_MPSAFE : 0; 718 int iflags = (flags & FDT_INTR_MPSAFE) ? IST_MPSAFE : 0;
718 struct bcm2836mp_interrupt *bip; 719 struct bcm2836mp_interrupt *bip;
719 void *ih; 720 void *ih;
720 721