svn commit: r238348 - head/sys/arm/at91

[Warner Losh]

Author: imp
Date: Tue Jul 10 15:02:29 2012
New Revision: 238348
URL: http://svn.freebsd.org/changeset/base/238348

Log:
  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.

Modified:
  head/sys/arm/at91/at91.c
  head/sys/arm/at91/at91rm9200.c
  head/sys/arm/at91/at91sam9260.c
  head/sys/arm/at91/at91sam9g20.c
  head/sys/arm/at91/at91sam9x25.c
  head/sys/arm/at91/at91var.h

Modified: head/sys/arm/at91/at91.c
==============================================================================
--- head/sys/arm/at91/at91.c	Tue Jul 10 14:21:25 2012	(r238347)
+++ head/sys/arm/at91/at91.c	Tue Jul 10 15:02:29 2012	(r238348)
@@ -365,7 +365,7 @@ at91_setup_intr(device_t dev, device_t c
 	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);

Modified: head/sys/arm/at91/at91rm9200.c
==============================================================================
--- head/sys/arm/at91/at91rm9200.c	Tue Jul 10 14:21:25 2012	(r238347)
+++ head/sys/arm/at91/at91rm9200.c	Tue Jul 10 15:02:29 2012	(r238348)
@@ -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 +

Modified: head/sys/arm/at91/at91sam9260.c
==============================================================================
--- head/sys/arm/at91/at91sam9260.c	Tue Jul 10 14:21:25 2012	(r238347)
+++ head/sys/arm/at91/at91sam9260.c	Tue Jul 10 15:02:29 2012	(r238348)
@@ -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 +

Modified: head/sys/arm/at91/at91sam9g20.c
==============================================================================
--- head/sys/arm/at91/at91sam9g20.c	Tue Jul 10 14:21:25 2012	(r238347)
+++ head/sys/arm/at91/at91sam9g20.c	Tue Jul 10 15:02:29 2012	(r238348)
@@ -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 +

Modified: head/sys/arm/at91/at91sam9x25.c
==============================================================================
--- head/sys/arm/at91/at91sam9x25.c	Tue Jul 10 14:21:25 2012	(r238347)
+++ head/sys/arm/at91/at91sam9x25.c	Tue Jul 10 15:02:29 2012	(r238348)
@@ -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 + 

Modified: head/sys/arm/at91/at91var.h
==============================================================================
--- head/sys/arm/at91/at91var.h	Tue Jul 10 14:21:25 2012	(r238347)
+++ head/sys/arm/at91/at91var.h	Tue Jul 10 15:02:29 2012	(r238348)
@@ -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 {