OHCI: remove uses of hcd->state

This patch (as1500) removes all uses of the objectionable hcd->state
variable from the ohci-hcd family of drivers.  It is replaced by a
private ohci->rh_state field, just as in uhci-hcd and ehci-hcd.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index 35e5fd640ce7..3a978a2130cb 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -344,6 +344,12 @@ typedef struct urb_priv {
  * a subset of what the full implementation needs. (Linus)
  */
 
+enum ohci_rh_state {
+        OHCI_RH_HALTED,
+        OHCI_RH_SUSPENDED,
+        OHCI_RH_RUNNING
+};
+
 struct ohci_hcd {
         spinlock_t              lock;
 
@@ -384,6 +390,7 @@ struct ohci_hcd {
         /*
          * driver state
          */
+        enum ohci_rh_state      rh_state;
         int                     num_ports;
         int                     load [NUM_INTS];
         u32                     hc_control;     /* copy of hc control reg */
@@ -680,11 +687,6 @@ static inline u16 ohci_hwPSW(const struct ohci_hcd *ohci,
 
 /*-------------------------------------------------------------------------*/
 
-static inline void disable (struct ohci_hcd *ohci)
-{
-        ohci_to_hcd(ohci)->state = HC_STATE_HALT;
-}
-
 #define FI                      0x2edf          /* 12000 bits per frame (-1) */
 #define FSMP(fi)                (0x7fff & ((6 * ((fi) - 210)) / 7))
 #define FIT                     (1 << 31)
@@ -708,7 +710,7 @@ static inline void periodic_reinit (struct ohci_hcd *ohci)
 #define read_roothub(hc, register, mask) ({ \
         u32 temp = ohci_readl (hc, &hc->regs->roothub.register); \
         if (temp == -1) \
-                disable (hc); \
+                hc->rh_state = OHCI_RH_HALTED; \
         else if (hc->flags & OHCI_QUIRK_AMD756) \
                 while (temp & mask) \
                         temp = ohci_readl (hc, &hc->regs->roothub.register); \