This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / usb / host / uhci-hcd.c

diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index bf8ab3c..92d1c28 100644 (file)
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -862,7 +862,7 @@ static int usb_control_retrigger_status(struct uhci_hcd *uhci, struct urb *urb)
        urbp->short_control_packet = 1;
 
        td = list_entry(urbp->td_list.prev, struct uhci_td, list);
-       urbp->qh->element = cpu_to_le32(td->dma_handle);
+       urbp->qh->element = td->dma_handle;
 
        return -EINPROGRESS;
 }
@@ -1762,7 +1762,7 @@ static void uhci_remove_pending_urbps(struct uhci_hcd *uhci)
 static irqreturn_t uhci_irq(struct usb_hcd *hcd, struct pt_regs *regs)
 {
        struct uhci_hcd *uhci = hcd_to_uhci(hcd);
-       unsigned long io_addr = uhci->io_addr;
+       unsigned int io_addr = uhci->io_addr;
        unsigned short status;
        struct list_head *tmp, *head;
        unsigned int age;
@@ -1835,7 +1835,7 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd, struct pt_regs *regs)
 
 static void reset_hc(struct uhci_hcd *uhci)
 {
-       unsigned long io_addr = uhci->io_addr;
+       unsigned int io_addr = uhci->io_addr;
 
        /* Turn off PIRQ, SMI, and all interrupts.  This also turns off
         * the BIOS's USB Legacy Support.
@@ -1856,7 +1856,7 @@ static void reset_hc(struct uhci_hcd *uhci)
 
 static void suspend_hc(struct uhci_hcd *uhci)
 {
-       unsigned long io_addr = uhci->io_addr;
+       unsigned int io_addr = uhci->io_addr;
 
        dev_dbg(uhci_dev(uhci), "%s\n", __FUNCTION__);
        uhci->state = UHCI_SUSPENDED;
@@ -1866,7 +1866,7 @@ static void suspend_hc(struct uhci_hcd *uhci)
 
 static void wakeup_hc(struct uhci_hcd *uhci)
 {
-       unsigned long io_addr = uhci->io_addr;
+       unsigned int io_addr = uhci->io_addr;
 
        switch (uhci->state) {
                case UHCI_SUSPENDED:            /* Start the resume */
@@ -1906,7 +1906,7 @@ static void wakeup_hc(struct uhci_hcd *uhci)
 
 static int ports_active(struct uhci_hcd *uhci)
 {
-       unsigned long io_addr = uhci->io_addr;
+       unsigned int io_addr = uhci->io_addr;
        int connection = 0;
        int i;
 
@@ -1918,7 +1918,7 @@ static int ports_active(struct uhci_hcd *uhci)
 
 static int suspend_allowed(struct uhci_hcd *uhci)
 {
-       unsigned long io_addr = uhci->io_addr;
+       unsigned int io_addr = uhci->io_addr;
        int i;
 
        if (to_pci_dev(uhci_dev(uhci))->vendor != PCI_VENDOR_ID_INTEL)
@@ -1983,7 +1983,7 @@ static void hc_state_transitions(struct uhci_hcd *uhci)
 
 static void start_hc(struct uhci_hcd *uhci)
 {
-       unsigned long io_addr = uhci->io_addr;
+       unsigned int io_addr = uhci->io_addr;
        int timeout = 1000;
 
        /*
@@ -2261,11 +2261,6 @@ static int uhci_start(struct usb_hcd *hcd)
                uhci->fl->frame[i] = cpu_to_le32(uhci->skelqh[irq]->dma_handle);
        }
 
-       /*
-        * Some architectures require a full mb() to enforce completion of
-        * the memory writes above before the I/O transfers in start_hc().
-        */
-       mb();
        start_hc(uhci);
 
        init_stall_timer(hcd);
@@ -2533,7 +2528,7 @@ static int __init uhci_hcd_init(void)
        }
 
 #ifdef CONFIG_PROC_FS
-       uhci_proc_root = create_proc_entry("driver/uhci", S_IFDIR, NULL);
+       uhci_proc_root = create_proc_entry("driver/uhci", S_IFDIR, 0);
        if (!uhci_proc_root)
                goto proc_failed;
 #endif
@@ -2556,7 +2551,7 @@ init_failed:
 up_failed:
 
 #ifdef CONFIG_PROC_FS
-       remove_proc_entry("driver/uhci", NULL);
+       remove_proc_entry("driver/uhci", 0);
 
 proc_failed:
 #endif
@@ -2576,7 +2571,7 @@ static void __exit uhci_hcd_cleanup(void)
                warn("not all urb_priv's were freed!");
 
 #ifdef CONFIG_PROC_FS
-       remove_proc_entry("driver/uhci", NULL);
+       remove_proc_entry("driver/uhci", 0);
 #endif
 
        if (errbuf)