USB: EHCI: remove usages of hcd->state

This patch (as1483) improves the ehci-hcd driver family by getting rid
of the reliance on the hcd->state variable.  It has no clear owner and
it isn't protected by the usual HCD locks.  In its place, the patch
adds a new, private ehci->rh_state field to record the state of the
root hub.

Along the way, the patch removes a couple of lines containing
redundant assignments to the state variable.  Also, the QUIESCING
state simply gets changed to the RUNNING state, because the driver
doesn't make any distinction between them.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 15 insertions, 2 deletions

diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 40a844c1dbb4..9952505d2357 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -697,6 +697,19 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
 }
 #undef DBG_SCHED_LIMIT
 
+static const char *rh_state_string(struct ehci_hcd *ehci)
+{
+        switch (ehci->rh_state) {
+        case EHCI_RH_HALTED:
+                return "halted";
+        case EHCI_RH_SUSPENDED:
+                return "suspended";
+        case EHCI_RH_RUNNING:
+                return "running";
+        }
+        return "?";
+}
+
 static ssize_t fill_registers_buffer(struct debug_buffer *buf)
 {
         struct usb_hcd          *hcd;
@@ -730,11 +743,11 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
         temp = scnprintf (next, size,
                 "bus %s, device %s\n"
                 "%s\n"
-                "EHCI %x.%02x, hcd state %d\n",
+                "EHCI %x.%02x, rh state %s\n",
                 hcd->self.controller->bus->name,
                 dev_name(hcd->self.controller),
                 hcd->product_desc,
-                i >> 8, i & 0x0ff, hcd->state);
+                i >> 8, i & 0x0ff, rh_state_string(ehci));
         size -= temp;
         next += temp;