Linus,
Please apply to 2.3.99-pre2.
Most drivers (non-USB) already do this.
This change is at user request.
~Randy
diff -u -X /home/rdunlap/dontdiff linux/drivers/usb-2399pre2/uhci.c
linux/drivers/usb/uhci.c
--- linux/drivers/usb-2399pre2/uhci.c Fri Mar 17 14:19:33 2000
+++ linux/drivers/usb/uhci.c Sun Mar 19 17:01:22 2000
@@ -1985,6 +1985,15 @@
{
int retval;
struct uhci *uhci;
+ char buf[8], *bufp = buf;
+
+#ifndef __sparc__
+ sprintf(buf, "%d", irq);
+#else
+ bufp = __irq_itoa(irq);
+#endif
+ printk(KERN_INFO __FILE__ ": USB UHCI at I/O 0x%x, IRQ %s\n",
+ io_addr, bufp);
uhci = alloc_uhci(io_addr, io_size);
if (!uhci)
diff -u -X /home/rdunlap/dontdiff linux/drivers/usb-2399pre2/usb-ohci.c
linux/drivers/usb/usb-ohci.c
--- linux/drivers/usb-2399pre2/usb-ohci.c Fri Mar 17 14:19:42 2000
+++ linux/drivers/usb/usb-ohci.c Sun Mar 19 17:01:49 2000
@@ -1650,16 +1650,24 @@
static int hc_found_ohci (struct pci_dev *dev, int irq, void * mem_base)
{
ohci_t * ohci;
- dbg("USB HC found: irq= %d membase= %lx", irq, (unsigned long) mem_base);
+ char buf[8], *bufp = buf;
+
+#ifndef __sparc__
+ sprintf(buf, "%d", irq);
+#else
+ bufp = __irq_itoa(irq);
+#endif
+ printk(KERN_INFO __FILE__ ": USB OHCI at membase 0x%lx, IRQ %s\n",
+ (unsigned long) mem_base, bufp);
ohci = hc_alloc_ohci (mem_base);
if (!ohci) {
return -ENOMEM;
}
-
+
INIT_LIST_HEAD (&ohci->ohci_hcd_list);
list_add (&ohci->ohci_hcd_list, &ohci_hcd_list);
-
+
hc_reset (ohci);
writel (ohci->hc_control = OHCI_USB_RESET, &ohci->regs->control);
wait_ms (10);
diff -u -X /home/rdunlap/dontdiff linux/drivers/usb-2399pre2/usb-uhci.c
linux/drivers/usb/usb-uhci.c
--- linux/drivers/usb-2399pre2/usb-uhci.c Wed Mar 15 17:00:58 2000
+++ linux/drivers/usb/usb-uhci.c Sun Mar 19 17:01:43 2000
@@ -2597,6 +2597,15 @@
uhci_t *s;
struct usb_bus *bus;
struct pm_dev *pmdev;
+ char buf[8], *bufp = buf;
+
+#ifndef __sparc__
+ sprintf(buf, "%d", irq);
+#else
+ bufp = __irq_itoa(irq);
+#endif
+ printk(KERN_INFO __FILE__ ": USB UHCI at I/O 0x%x, IRQ %s\n",
+ io_addr, bufp);
s = kmalloc (sizeof (uhci_t), GFP_KERNEL);
if (!s)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
