u132-hcd: use HUB_CHAR_*
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Sun, 18 Jan 2015 22:49:59 +0000 (01:49 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Jan 2015 13:01:13 +0000 (21:01 +0800)
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>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/u132-hcd.c

index 2894e54e5b9c47451d78001a90c50fbf6d266b72..ad97e8a1ad1cb733fea7145921bbdfe45d9b5925 100644 (file)
@@ -2590,15 +2590,15 @@ static int u132_roothub_descriptor(struct u132 *u132,
        desc->bNbrPorts = u132->num_ports;
        temp = 1 + (u132->num_ports / 8);
        desc->bDescLength = 7 + 2 * temp;
-       temp = 0;
+       temp = HUB_CHAR_COMMON_LPSM | HUB_CHAR_COMMON_OCPM;
        if (rh_a & RH_A_NPS)
-               temp |= 0x0002;
+               temp |= HUB_CHAR_NO_LPSM;
        if (rh_a & RH_A_PSM)
-               temp |= 0x0001;
+               temp |= HUB_CHAR_INDV_PORT_LPSM;
        if (rh_a & RH_A_NOCP)
-               temp |= 0x0010;
+               temp |= HUB_CHAR_NO_OCPM;
        else if (rh_a & RH_A_OCPM)
-               temp |= 0x0008;
+               temp |= HUB_CHAR_INDV_PORT_OCPM;
        desc->wHubCharacteristics = cpu_to_le16(temp);
        retval = u132_read_pcimem(u132, roothub.b, &rh_b);
        if (retval)