When expanding an inline function make sure you get the argument order

correct!

Now there's no functional change to expanding bcm2835_intr_establish
This commit is contained in:
skrll 2015-07-29 14:22:49 +00:00
parent 949233f4de
commit 679cf18640
8 changed files with 24 additions and 24 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: bcm2835_dmac.c,v 1.10 2015/07/29 10:47:58 skrll Exp $ */
/* $NetBSD: bcm2835_dmac.c,v 1.11 2015/07/29 14:22:49 skrll Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <jmcneill@invisible.ca>
@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bcm2835_dmac.c,v 1.10 2015/07/29 10:47:58 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: bcm2835_dmac.c,v 1.11 2015/07/29 14:22:49 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -214,7 +214,7 @@ bcm_dmac_alloc(enum bcm_dmac_type type, int ipl, void (*cb)(void *),
KASSERT(ch->ch_ih == NULL);
ch->ch_ih = intr_establish(BCM2835_INT_DMA0 + ch->ch_index,
IST_LEVEL, ipl, bcm_dmac_intr, ch);
ipl, IST_LEVEL, bcm_dmac_intr, ch);
if (ch->ch_ih == NULL) {
aprint_error_dev(sc->sc_dev,
"failed to establish interrupt for DMA%d\n", ch->ch_index);

View File

@ -1,4 +1,4 @@
/* $NetBSD: bcm2835_dwctwo.c,v 1.3 2015/07/29 10:47:58 skrll Exp $ */
/* $NetBSD: bcm2835_dwctwo.c,v 1.4 2015/07/29 14:22:49 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bcm2835_dwctwo.c,v 1.3 2015/07/29 10:47:58 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: bcm2835_dwctwo.c,v 1.4 2015/07/29 14:22:49 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -130,7 +130,7 @@ bcmdwc2_attach(device_t parent, device_t self, void *aux)
aprint_naive(": USB controller\n");
aprint_normal(": USB controller\n");
sc->sc_ih = intr_establish(aaa->aaa_intr, IST_LEVEL, IPL_SCHED,
sc->sc_ih = intr_establish(aaa->aaa_intr, IPL_SCHED, IST_LEVEL,
dwc2_intr, &sc->sc_dwc2);
if (sc->sc_ih == NULL) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: bcm2835_emmc.c,v 1.22 2015/07/29 10:47:58 skrll Exp $ */
/* $NetBSD: bcm2835_emmc.c,v 1.23 2015/07/29 14:22:49 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.22 2015/07/29 10:47:58 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.23 2015/07/29 14:22:49 skrll Exp $");
#include "bcmdmac.h"
@ -143,7 +143,7 @@ bcmemmc_attach(device_t parent, device_t self, void *aux)
aprint_naive(": SDHC controller\n");
aprint_normal(": SDHC controller\n");
sc->sc_ih = intr_establish(aaa->aaa_intr, IST_LEVEL, IPL_SDMMC, sdhc_intr,
sc->sc_ih = intr_establish(aaa->aaa_intr, IPL_SDMMC, IST_LEVEL, sdhc_intr,
&sc->sc);
if (sc->sc_ih == NULL) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: bcm2835_mbox.c,v 1.10 2015/07/29 10:47:58 skrll Exp $ */
/* $NetBSD: bcm2835_mbox.c,v 1.11 2015/07/29 14:22:49 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox.c,v 1.10 2015/07/29 10:47:58 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox.c,v 1.11 2015/07/29 14:22:49 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -107,7 +107,7 @@ bcmmbox_attach(device_t parent, device_t self, void *aux)
return;
}
sc->sc_intrh = intr_establish(aaa->aaa_intr, IST_LEVEL, IPL_VM,
sc->sc_intrh = intr_establish(aaa->aaa_intr, IPL_VM, IST_LEVEL,
bcmmbox_intr, sc);
if (sc->sc_intrh == NULL) {
aprint_error_dev(sc->sc_dev, "unable to establish interrupt\n");

View File

@ -1,4 +1,4 @@
/* $NetBSD: bcm2835_plcom.c,v 1.2 2015/07/29 10:47:58 skrll Exp $ */
/* $NetBSD: bcm2835_plcom.c,v 1.3 2015/07/29 14:22:49 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@ -32,7 +32,7 @@
/* Interface to plcom (PL011) serial driver. */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bcm2835_plcom.c,v 1.2 2015/07/29 10:47:58 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: bcm2835_plcom.c,v 1.3 2015/07/29 14:22:49 skrll Exp $");
#include <sys/types.h>
#include <sys/device.h>
@ -91,7 +91,7 @@ bcm2835_plcom_attach(device_t parent, device_t self, void *aux)
}
plcom_attach_subr(sc);
ih = intr_establish(aaa->aaa_intr, IST_LEVEL, IPL_SERIAL, plcomintr, sc);
ih = intr_establish(aaa->aaa_intr, IPL_SERIAL, IST_LEVEL, plcomintr, sc);
if (ih == NULL)
panic("%s: cannot install interrupt handler",
device_xname(sc->sc_dev));

View File

@ -1,4 +1,4 @@
/* $NetBSD: bcm2835_spi.c,v 1.3 2015/07/29 10:47:58 skrll Exp $ */
/* $NetBSD: bcm2835_spi.c,v 1.4 2015/07/29 14:22:49 skrll Exp $ */
/*
* Copyright (c) 2012 Jonathan A. Kollasch
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bcm2835_spi.c,v 1.3 2015/07/29 10:47:58 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: bcm2835_spi.c,v 1.4 2015/07/29 14:22:49 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -109,7 +109,7 @@ bcmspi_attach(device_t parent, device_t self, void *aux)
for (u_int pin = 7; pin <= 11; pin++)
bcm2835gpio_function_select(pin, BCM2835_GPIO_ALT0);
sc->sc_intrh = intr_establish(aaa->aaa_intr, IST_LEVEL, IPL_VM,
sc->sc_intrh = intr_establish(aaa->aaa_intr, IPL_VM, IST_LEVEL,
bcmspi_intr, sc);
if (sc->sc_intrh == NULL) {
aprint_error_dev(sc->sc_dev, "unable to establish interrupt\n");

View File

@ -1,4 +1,4 @@
/* $NetBSD: bcm2835_tmr.c,v 1.6 2015/07/29 10:47:58 skrll Exp $ */
/* $NetBSD: bcm2835_tmr.c,v 1.7 2015/07/29 14:22:49 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.6 2015/07/29 10:47:58 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.7 2015/07/29 14:22:49 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -143,7 +143,7 @@ cpu_initclocks(void)
stcl += counts_per_hz;
bus_space_write_4(sc->sc_iot, sc->sc_ioh, BCM2835_STIMER_C3, stcl);
clock_ih = intr_establish(BCM2835_INT_TIMER3, IST_LEVEL, IPL_CLOCK,
clock_ih = intr_establish(BCM2835_INT_TIMER3, IPL_CLOCK, IST_LEVEL,
clockhandler, NULL);
if (clock_ih == NULL)
panic("%s: unable to register timer interrupt", __func__);

View File

@ -1,4 +1,4 @@
/* $NetBSD: vchiq_kmod_netbsd.c,v 1.4 2015/07/29 10:47:58 skrll Exp $ */
/* $NetBSD: vchiq_kmod_netbsd.c,v 1.5 2015/07/29 14:22:49 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vchiq_kmod_netbsd.c,v 1.4 2015/07/29 10:47:58 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: vchiq_kmod_netbsd.c,v 1.5 2015/07/29 14:22:49 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -117,7 +117,7 @@ vchiq_defer(device_t self)
vchiq_core_initialize();
sc->sc_ih = intr_establish(sc->sc_intr, IST_LEVEL, IPL_SCHED,
sc->sc_ih = intr_establish(sc->sc_intr, IPL_SCHED, IST_LEVEL,
vchiq_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt %d\n",