USB: EHCI: remove PS3 status polling

This patch (as1575) removes special code added for status polling of
the EHCI controller in PS3 systems.  While the controller is running,
the polling is now carried out by an hrtimer handler.  When the
controller is suspending or stopping, we use the same polling routine
as the old code -- but in neither case do we need to conclude that the
controller has died if the polling goes on for too long.

As a result the entire handshake_on_error_set_halt() routine is now
unused, so it is removed from the driver.

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

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 7e00ca095cea1f58e42b63cf013ab5ab92338508..fd7ae16f77be4fc429d33f6cb78428e4aa0ebfbd 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -235,68 +235,6 @@ static int ehci_halt (struct ehci_hcd *ehci)
                          STS_HALT, STS_HALT, 16 * 125);
 }
 
-#if defined(CONFIG_USB_SUSPEND) && defined(CONFIG_PPC_PS3)
-
-/*
- * The EHCI controller of the Cell Super Companion Chip used in the
- * PS3 will stop the root hub after all root hub ports are suspended.
- * When in this condition handshake will return -ETIMEDOUT.  The
- * STS_HLT bit will not be set, so inspection of the frame index is
- * used here to test for the condition.  If the condition is found
- * return success to allow the USB suspend to complete.
- */
-
-static int handshake_for_broken_root_hub(struct ehci_hcd *ehci,
-                                        void __iomem *ptr, u32 mask, u32 done,
-                                        int usec)
-{
-       unsigned int old_index;
-       int error;
-
-       if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
-               return -ETIMEDOUT;
-
-       old_index = ehci_read_frame_index(ehci);
-
-       error = handshake(ehci, ptr, mask, done, usec);
-
-       if (error == -ETIMEDOUT && ehci_read_frame_index(ehci) == old_index)
-               return 0;
-
-       return error;
-}
-
-#else
-
-static int handshake_for_broken_root_hub(struct ehci_hcd *ehci,
-                                        void __iomem *ptr, u32 mask, u32 done,
-                                        int usec)
-{
-       return -ETIMEDOUT;
-}
-
-#endif
-
-static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
-                                      u32 mask, u32 done, int usec)
-{
-       int error;
-
-       error = handshake(ehci, ptr, mask, done, usec);
-       if (error == -ETIMEDOUT)
-               error = handshake_for_broken_root_hub(ehci, ptr, mask, done,
-                                                     usec);
-
-       if (error) {
-               ehci_halt(ehci);
-               ehci->rh_state = EHCI_RH_HALTED;
-               ehci_err(ehci, "force halt; handshake %p %08x %08x -> %d\n",
-                       ptr, mask, done, error);
-       }
-
-       return error;
-}
-
 /* put TDI/ARC silicon into EHCI mode */
 static void tdi_reset (struct ehci_hcd *ehci)
 {
@@ -361,17 +299,14 @@ static void ehci_quiesce (struct ehci_hcd *ehci)
 
        /* wait for any schedule enables/disables to take effect */
        temp = (ehci->command << 10) & (STS_ASS | STS_PSS);
-       if (handshake_on_error_set_halt(ehci, &ehci->regs->status,
-                                       STS_ASS | STS_PSS, temp, 16 * 125))
-               return;
+       handshake(ehci, &ehci->regs->status, STS_ASS | STS_PSS, temp, 16 * 125);
 
        /* then disable anything that's still active */
        ehci->command &= ~(CMD_ASE | CMD_PSE);
        ehci_writel(ehci, ehci->command, &ehci->regs->command);
 
        /* hardware can take 16 microframes to turn off ... */
-       handshake_on_error_set_halt(ehci, &ehci->regs->status,
-                                   STS_ASS | STS_PSS, 0, 16 * 125);
+       handshake(ehci, &ehci->regs->status, STS_ASS | STS_PSS, 0, 16 * 125);
 }
 
 /*-------------------------------------------------------------------------*/