socsvn commit: r271976 - soc2014/astarasikov/head/sys/arm/goldfish

[astarasikov at FreeBSD.org]

Author: astarasikov
Date: Wed Aug  6 01:36:05 2014
New Revision: 271976
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271976

Log:
  [goldfish]: minor fixes in PIC
  

Modified:
  soc2014/astarasikov/head/sys/arm/goldfish/goldfish_pic.c

Modified: soc2014/astarasikov/head/sys/arm/goldfish/goldfish_pic.c
==============================================================================
--- soc2014/astarasikov/head/sys/arm/goldfish/goldfish_pic.c	Wed Aug  6 01:35:07 2014	(r271975)
+++ soc2014/astarasikov/head/sys/arm/goldfish/goldfish_pic.c	Wed Aug  6 01:36:05 2014	(r271976)
@@ -86,10 +86,10 @@
 {
 	struct goldfish_pic_softc *sc = device_get_softc(dev);
 	int rid = 0;
-	
+
 	if (intc_softc)
 		return (ENXIO);
-	
+
 	sc->li_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, 
 	    RF_ACTIVE);
 	if (!sc->li_res)
@@ -119,11 +119,7 @@
 
 static devclass_t goldfish_pic_devclass;
 
-EARLY_DRIVER_MODULE(pic, simplebus, goldfish_pic_driver, goldfish_pic_devclass,
-	0, 0, BUS_PASS_INTERRUPT);
-EARLY_DRIVER_MODULE(pic, fdtbus, goldfish_pic_driver, goldfish_pic_devclass,
-	0, 0, BUS_PASS_INTERRUPT);
-//DRIVER_MODULE(pic, simplebus, goldfish_pic_driver, goldfish_pic_devclass, 0, 0);
+DRIVER_MODULE(pic, simplebus, goldfish_pic_driver, goldfish_pic_devclass, 0, 0);
 
 int
 arm_get_next_irq(int last)
@@ -132,7 +128,7 @@
 		return (-1);
 
 	int rc = intc_read_4(GOLDFISH_PIC_NUMBER);
-	if (rc >= 0)
+	if (rc > 0)
 		return (rc);
 
 	return (-1);