diff options
| author | Warner Losh <imp@FreeBSD.org> | 2012-07-10 15:02:29 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2012-07-10 15:02:29 +0000 |
| commit | d67febb24f8f202d4cd13d3b9ad30a42a60896fd (patch) | |
| tree | e38ff59d508b481c21ce001ac03ed1270ac3f274 /sys/arm | |
| parent | 72ee489703aa86efe552e30c33bb71c982b4f7bf (diff) | |
| download | src-d67febb24f8f202d4cd13d3b9ad30a42a60896fd.tar.gz src-d67febb24f8f202d4cd13d3b9ad30a42a60896fd.zip | |
Remove a useless bit of indirection. On all Atmel ARM products, irq 1
is the system IRQ, so use the define for it and get on with life.
Notes
Notes:
svn path=/head/; revision=238348
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/at91/at91.c | 2 | ||||
| -rw-r--r-- | sys/arm/at91/at91rm9200.c | 1 | ||||
| -rw-r--r-- | sys/arm/at91/at91sam9260.c | 1 | ||||
| -rw-r--r-- | sys/arm/at91/at91sam9g20.c | 1 | ||||
| -rw-r--r-- | sys/arm/at91/at91sam9x25.c | 1 | ||||
| -rw-r--r-- | sys/arm/at91/at91var.h | 1 |
6 files changed, 1 insertions, 6 deletions
diff --git a/sys/arm/at91/at91.c b/sys/arm/at91/at91.c index fc79da2190e8..da3aa72b0508 100644 --- a/sys/arm/at91/at91.c +++ b/sys/arm/at91/at91.c @@ -365,7 +365,7 @@ at91_setup_intr(device_t dev, device_t child, struct at91_softc *sc = device_get_softc(dev); int error; - if (rman_get_start(ires) == sc->sc_irq_system && filt == NULL) + if (rman_get_start(ires) == AT91_IRQ_SYSTEM && filt == NULL) panic("All system interrupt ISRs must be FILTER"); error = BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); diff --git a/sys/arm/at91/at91rm9200.c b/sys/arm/at91/at91rm9200.c index 1a7a446719b7..a3ceec4d5847 100644 --- a/sys/arm/at91/at91rm9200.c +++ b/sys/arm/at91/at91rm9200.c @@ -204,7 +204,6 @@ at91_attach(device_t dev) /* XXX Hack to tell atmelarm about the AIC */ at91sc->sc_aic_sh = sc->sc_aic_sh; - at91sc->sc_irq_system = AT91_IRQ_SYSTEM; for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR + diff --git a/sys/arm/at91/at91sam9260.c b/sys/arm/at91/at91sam9260.c index c6dd887b63ca..d67d1f4b8343 100644 --- a/sys/arm/at91/at91sam9260.c +++ b/sys/arm/at91/at91sam9260.c @@ -204,7 +204,6 @@ at91_attach(device_t dev) /* XXX Hack to tell atmelarm about the AIC */ at91sc->sc_aic_sh = sc->sc_aic_sh; - at91sc->sc_irq_system = AT91_IRQ_SYSTEM; for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR + diff --git a/sys/arm/at91/at91sam9g20.c b/sys/arm/at91/at91sam9g20.c index 5a9c172c9390..5f1fc9babff8 100644 --- a/sys/arm/at91/at91sam9g20.c +++ b/sys/arm/at91/at91sam9g20.c @@ -215,7 +215,6 @@ at91_attach(device_t dev) /* XXX Hack to tell atmelarm about the AIC */ at91sc->sc_aic_sh = sc->sc_aic_sh; - at91sc->sc_irq_system = AT91_IRQ_SYSTEM; for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR + diff --git a/sys/arm/at91/at91sam9x25.c b/sys/arm/at91/at91sam9x25.c index 8943669a90f5..7b7422df8398 100644 --- a/sys/arm/at91/at91sam9x25.c +++ b/sys/arm/at91/at91sam9x25.c @@ -218,7 +218,6 @@ at91_attach(device_t dev) /* XXX Hack to tell atmelarm about the AIC */ at91sc->sc_aic_sh = sc->sc_aic_sh; - at91sc->sc_irq_system = AT91_IRQ_SYSTEM; for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR + diff --git a/sys/arm/at91/at91var.h b/sys/arm/at91/at91var.h index e58d974a6149..614687c83cd9 100644 --- a/sys/arm/at91/at91var.h +++ b/sys/arm/at91/at91var.h @@ -40,7 +40,6 @@ struct at91_softc { bus_space_handle_t sc_aic_sh; struct rman sc_irq_rman; struct rman sc_mem_rman; - uint32_t sc_irq_system; }; struct at91_ivar { |