[adm5120] fix usb mis-cleanup after r27162 (#9581)

[openwrt.git] / target / linux / adm5120 / files / drivers / usb / host / adm5120-hub.c

diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-hub.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-hub.c
index d1e7d43..3c1ab65 100644 (file)
--- a/target/linux/adm5120/files/drivers/usb/host/adm5120-hub.c
+++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-hub.c
@@ -1,19 +1,25 @@
 /*
 /*

- * OHCI HCD (Host Controller Driver) for USB.
+ * ADM5120 HCD (Host Controller Driver) for USB

  *
  *

- * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
- * (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
+ * Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This file was derived from: drivers/usb/host/ohci-hub.c
+ *   (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
+ *   (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.

  *
  *

- * This file is licenced under GPL

  */
 
 /*-------------------------------------------------------------------------*/
 
 /*
  */
 
 /*-------------------------------------------------------------------------*/
 
 /*

- * OHCI Root Hub ... the nonsharable stuff
+ * ADM5120 Root Hub ... the nonsharable stuff

  */
 
  */
 

-#define dbg_port(hc,label,num,value) \
+#define dbg_port(hc, label, num, value) \

        admhc_dbg(hc, \
                "%s port%d " \
                "= 0x%08x%s%s%s%s%s%s%s%s%s%s%s%s\n", \
        admhc_dbg(hc, \
                "%s port%d " \
                "= 0x%08x%s%s%s%s%s%s%s%s%s%s%s%s\n", \


@@ -34,7 +40,7 @@
                (value & ADMHC_PS_CCS) ? " CCS" : "" \
                );
 
                (value & ADMHC_PS_CCS) ? " CCS" : "" \
                );
 

-#define dbg_port_write(hc,label,num,value) \
+#define dbg_port_write(hc, label, num, value) \

        admhc_dbg(hc, \
                "%s port%d " \
                "= 0x%08x%s%s%s%s%s%s%s%s%s%s%s%s\n", \
        admhc_dbg(hc, \
                "%s port%d " \
                "= 0x%08x%s%s%s%s%s%s%s%s%s%s%s%s\n", \


@@ -57,20 +63,6 @@
 
 /*-------------------------------------------------------------------------*/
 
 
 /*-------------------------------------------------------------------------*/
 

-/* hcd->hub_irq_enable() */
-static void admhc_hub_irq_enable(struct usb_hcd *hcd)
-{
-       struct admhcd   *ahcd = hcd_to_admhcd(hcd);
-
-       spin_lock_irq(&ahcd->lock);
-       if (!ahcd->autostop)
-               del_timer(&hcd->rh_timer);      /* Prevent next poll */
-       admhc_intr_enable(ahcd, ADMHC_INTR_INSM);
-       spin_unlock_irq(&ahcd->lock);
-}
-
-/*-------------------------------------------------------------------------*/
-

 /* build "status change" packet (one or two bytes) from HC registers */
 
 static int
 /* build "status change" packet (one or two bytes) from HC registers */
 
 static int


@@ -89,11 +81,11 @@ admhc_hub_status_data(struct usb_hcd *hcd, char *buf)
        /* init status */
        status = admhc_read_rhdesc(ahcd);
        if (status & (ADMHC_RH_LPSC | ADMHC_RH_OCIC))
        /* init status */
        status = admhc_read_rhdesc(ahcd);
        if (status & (ADMHC_RH_LPSC | ADMHC_RH_OCIC))

-               buf [0] = changed = 1;
+               buf[0] = changed = 1;

        else
        else

-               buf [0] = 0;
+               buf[0] = 0;

        if (ahcd->num_ports > 7) {
        if (ahcd->num_ports > 7) {

-               buf [1] = 0;
+               buf[1] = 0;

                length++;
        }
 
                length++;
        }
 


@@ -108,9 +100,9 @@ admhc_hub_status_data(struct usb_hcd *hcd, char *buf)
                                | ADMHC_PS_OCIC | ADMHC_PS_PRSC)) {
                        changed = 1;
                        if (i < 7)
                                | ADMHC_PS_OCIC | ADMHC_PS_PRSC)) {
                        changed = 1;
                        if (i < 7)

-                           buf [0] |= 1 << (i + 1);
+                               buf[0] |= 1 << (i + 1);

                        else
                        else

-                           buf [1] |= 1 << (i - 7);
+                               buf[1] |= 1 << (i - 7);

                }
        }
 
                }
        }
 


@@ -255,7 +247,7 @@ static void start_hnp(struct admhcd *ahcd);
 #define        PORT_RESET_HW_MSEC      10
 
 /* wrap-aware logic morphed from <linux/jiffies.h> */
 #define        PORT_RESET_HW_MSEC      10
 
 /* wrap-aware logic morphed from <linux/jiffies.h> */

-#define tick_before(t1,t2) ((s16)(((s16)(t1))-((s16)(t2))) < 0)
+#define tick_before(t1, t2) ((s16)(((s16)(t1)) - ((s16)(t2))) < 0)

 
 /* called from some task, normally khubd */
 static inline int admhc_port_reset(struct admhcd *ahcd, unsigned port)
 
 /* called from some task, normally khubd */
 static inline int admhc_port_reset(struct admhcd *ahcd, unsigned port)