USB: remove bogus USB_PORT_FEAT_*_SPEED symbols

[mirror_ubuntu-artful-kernel.git] / drivers / usb / host / sl811-hcd.c

diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 3b867a8af7b2d15df00d0dbf6f595e00b2f32b24..dcd7fab7179cf3fb166f6d46b243159f9f19980a 100644 (file)
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -45,6 +45,7 @@
 #include <linux/interrupt.h>
 #include <linux/usb.h>
 #include <linux/usb/sl811.h>
+#include <linux/usb/hcd.h>
 #include <linux/platform_device.h>
 
 #include <asm/io.h>
@@ -53,7 +54,6 @@
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
 
-#include "../core/hcd.h"
 #include "sl811.h"
 
 
@@ -1121,7 +1121,7 @@ sl811h_timer(unsigned long _sl811)
        u8              signaling = sl811->ctrl1 & SL11H_CTL1MASK_FORCE;
        const u32       mask = (1 << USB_PORT_FEAT_CONNECTION)
                                | (1 << USB_PORT_FEAT_ENABLE)
-                               | (1 << USB_PORT_FEAT_LOWSPEED);
+                               | USB_PORT_STAT_LOW_SPEED;
 
        spin_lock_irqsave(&sl811->lock, flags);
 
@@ -1162,7 +1162,7 @@ sl811h_timer(unsigned long _sl811)
        } else {
                sl811->port1 |= mask;
                if (irqstat & SL11H_INTMASK_DP)
-                       sl811->port1 &= ~(1 << USB_PORT_FEAT_LOWSPEED);
+                       sl811->port1 &= ~USB_PORT_STAT_LOW_SPEED;
                sl811->irq_enable = SL11H_INTMASK_INSRMV | SL11H_INTMASK_RD;
        }
 
@@ -1173,7 +1173,7 @@ sl811h_timer(unsigned long _sl811)
 #ifdef USE_B
                sl811->irq_enable |= SL11H_INTMASK_DONE_B;
 #endif
-               if (sl811->port1 & (1 << USB_PORT_FEAT_LOWSPEED)) {
+               if (sl811->port1 & USB_PORT_STAT_LOW_SPEED) {
                        sl811->ctrl1 |= SL11H_CTL1MASK_LSPD;
                        ctrl2 |= SL811HS_CTL2MASK_DSWAP;
                }