ohci-hub: use HUB_CHAR_*

Fix  using the  bare numbers to set the 'wHubCharacteristics' field of the Hub
Descriptor while the values are #define'd in <linux/usb/ch11.h>.

While at it, fix the indentation.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 0aa17c9371151f37744708ef9a804503426a6a51..fe2aedd8a54db23c6cb692fba8d250b3c01a4320 100644 (file)
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -544,15 +544,15 @@ ohci_hub_descriptor (
        temp = 1 + (ohci->num_ports / 8);
        desc->bDescLength = 7 + 2 * temp;
 
-       temp = 0;
+       temp = HUB_CHAR_COMMON_LPSM | HUB_CHAR_COMMON_OCPM;
        if (rh & RH_A_NPS)              /* no power switching? */
-           temp |= 0x0002;
+               temp |= HUB_CHAR_NO_LPSM;
        if (rh & RH_A_PSM)              /* per-port power switching? */
-           temp |= 0x0001;
+               temp |= HUB_CHAR_INDV_PORT_LPSM;
        if (rh & RH_A_NOCP)             /* no overcurrent reporting? */
-           temp |= 0x0010;
+               temp |= HUB_CHAR_NO_OCPM;
        else if (rh & RH_A_OCPM)        /* per-port overcurrent reporting? */
-           temp |= 0x0008;
+               temp |= HUB_CHAR_INDV_PORT_OCPM;
        desc->wHubCharacteristics = cpu_to_le16(temp);
 
        /* ports removable, and usb 1.0 legacy PortPwrCtrlMask */