Cleanup

Approved by:	re (blanket)

2 files changed, 2 insertions, 8 deletions

diff --git a/sys/arm/xscale/i80321/i80321_pci.c b/sys/arm/xscale/i80321/i80321_pci.c
index aa4801d..6eb96b9 100644
--- a/sys/arm/xscale/i80321/i80321_pci.c
+++ b/sys/arm/xscale/i80321/i80321_pci.c
@@ -186,7 +186,7 @@ i80321_pci_read_config(device_t dev, int bus, int slot, int func, int reg,
 	if (i80321_pci_conf_setup(sc, bus, slot, func, reg & ~3, &addr))
 		return (-1);
 	bus_space_write_4(sc->sc_st, sc->sc_atu_sh, ATU_OCCAR,
-	    addr/* & ~3*/);
+	    addr);
 
 	va = sc->sc_atu_sh;
 	switch (bytes) {
@@ -200,7 +200,7 @@ i80321_pci_read_config(device_t dev, int bus, int slot, int func, int reg,
 		err = badaddr_read((void *)(va + ATU_OCCDR), 4, &ret);
 		break;
 	default:
-		printf("i803218_read_config: invalid size %d\n", bytes);
+		printf("i80321_read_config: invalid size %d\n", bytes);
 		ret = -1;
 	}
 	if (err) {
diff --git a/sys/arm/xscale/i80321/obio.c b/sys/arm/xscale/i80321/obio.c
index b4026eb..f6ed791 100644
--- a/sys/arm/xscale/i80321/obio.c
+++ b/sys/arm/xscale/i80321/obio.c
@@ -128,12 +128,6 @@ obio_alloc_resource(device_t bus, device_t child, int type, int *rid,
 	rman_set_bustag(rv, bt);
 	rman_set_bushandle(rv, bh);
 	
-	if (0) {
-		if (bus_activate_resource(child, type, *rid, rv)) {
-			rman_release_resource(rv);
-			return (NULL);
-		}
-	}
 	return (rv);
 
 }