PERFORCE change 101872 for review

[Olivier Houchard]

http://perforce.freebsd.org/chv.cgi?CH=101872

Change 101872 by cognet at cognet on 2006/07/18 21:04:28

	On a second thought, go ahead and remove the "irid" arg from 
	uart_bus_probe(). AFAIK we never really used it. 
	I'll back this out if it is feeled we need it.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/uart_bus_at91usart.c#9 edit
.. //depot/projects/arm/src/sys/dev/uart/uart_bus.h#6 edit
.. //depot/projects/arm/src/sys/dev/uart/uart_bus_pci.c#5 edit
.. //depot/projects/arm/src/sys/dev/uart/uart_core.c#9 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/uart_bus_at91usart.c#9 (text+ko) ====

@@ -102,7 +102,7 @@
 		break;
 	}
 	sc->sc_class = &at91_usart_class;
-	return (uart_bus_probe(dev, 0, 0, 0, device_get_unit(dev), 0));
+	return (uart_bus_probe(dev, 0, 0, 0, device_get_unit(dev)));
 }
 
 

==== //depot/projects/arm/src/sys/dev/uart/uart_bus.h#6 (text+ko) ====

@@ -142,8 +142,7 @@
 int uart_bus_detach(device_t dev);
 serdev_intr_t *uart_bus_ihand(device_t dev, int ipend);
 int uart_bus_ipend(device_t dev);
-int uart_bus_probe(device_t dev, int regshft, int rclk, int rid, int chan,
-	int irid);
+int uart_bus_probe(device_t dev, int regshft, int rclk, int rid, int chan);
 int uart_bus_sysdev(device_t dev);
 
 int uart_tty_attach(struct uart_softc *);

==== //depot/projects/arm/src/sys/dev/uart/uart_bus_pci.c#5 (text+ko) ====

@@ -153,7 +153,7 @@
  match:
 	if (id->desc)
 		device_set_desc(dev, id->desc);
-	return (uart_bus_probe(dev, 0, id->rclk, id->rid, 0, 0));
+	return (uart_bus_probe(dev, 0, id->rclk, id->rid, 0));
 }
 
 DRIVER_MODULE(uart, pci, uart_pci_driver, uart_devclass, 0, 0);

==== //depot/projects/arm/src/sys/dev/uart/uart_core.c#9 (text+ko) ====

@@ -285,7 +285,7 @@
 }
 
 int
-uart_bus_probe(device_t dev, int regshft, int rclk, int rid, int chan, int irid)
+uart_bus_probe(device_t dev, int regshft, int rclk, int rid, int chan)
 {
 	struct uart_softc *sc;
 	struct uart_devinfo *sysdev;
@@ -323,7 +323,7 @@
 		if (sc->sc_rres == NULL)
 			return (ENXIO);
 	}
-	sc->sc_irid = irid;	/* stash the irq rid */
+	sc->sc_irid = 0;
 
 	/*
 	 * Fill in the bus access structure and compare this device with