These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / host / u132-hcd.c

diff --git a/kernel/drivers/usb/host/u132-hcd.c b/kernel/drivers/usb/host/u132-hcd.c
index d516877..692ccc6 100644 (file)
--- a/kernel/drivers/usb/host/u132-hcd.c
+++ b/kernel/drivers/usb/host/u132-hcd.c
@@ -1542,11 +1542,8 @@ static int u132_periodic_reinit(struct u132 *u132)
                (fit ^ FIT) | u132->hc_fminterval);
        if (retval)
                return retval;
-       retval = u132_write_pcimem(u132, periodicstart,
-               ((9 * fi) / 10) & 0x3fff);
-       if (retval)
-               return retval;
-       return 0;
+       return u132_write_pcimem(u132, periodicstart,
+              ((9 * fi) / 10) & 0x3fff);
 }
 
 static char *hcfs2string(int state)
@@ -2247,9 +2244,8 @@ static int u132_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
 {
        struct u132 *u132 = hcd_to_u132(hcd);
        if (irqs_disabled()) {
-               if (__GFP_WAIT & mem_flags) {
-                       printk(KERN_ERR "invalid context for function that migh"
-                               "t sleep\n");
+               if (gfpflags_allow_blocking(mem_flags)) {
+                       printk(KERN_ERR "invalid context for function that might sleep\n");
                        return -EINVAL;
                }
        }
@@ -2701,28 +2697,18 @@ static int u132_roothub_setportfeature(struct u132 *u132, u16 wValue,
        if (wIndex == 0 || wIndex > u132->num_ports) {
                return -EINVAL;
        } else {
-               int retval;
                int port_index = wIndex - 1;
                struct u132_port *port = &u132->port[port_index];
                port->Status &= ~(1 << wValue);
                switch (wValue) {
                case USB_PORT_FEAT_SUSPEND:
-                       retval = u132_write_pcimem(u132,
-                               roothub.portstatus[port_index], RH_PS_PSS);
-                       if (retval)
-                               return retval;
-                       return 0;
+                       return u132_write_pcimem(u132,
+                              roothub.portstatus[port_index], RH_PS_PSS);
                case USB_PORT_FEAT_POWER:
-                       retval = u132_write_pcimem(u132,
-                               roothub.portstatus[port_index], RH_PS_PPS);
-                       if (retval)
-                               return retval;
-                       return 0;
+                       return u132_write_pcimem(u132,
+                              roothub.portstatus[port_index], RH_PS_PPS);
                case USB_PORT_FEAT_RESET:
-                       retval = u132_roothub_portreset(u132, port_index);
-                       if (retval)
-                               return retval;
-                       return 0;
+                       return u132_roothub_portreset(u132, port_index);
                default:
                        return -EPIPE;
                }
@@ -2737,7 +2723,6 @@ static int u132_roothub_clearportfeature(struct u132 *u132, u16 wValue,
        } else {
                int port_index = wIndex - 1;
                u32 temp;
-               int retval;
                struct u132_port *port = &u132->port[port_index];
                port->Status &= ~(1 << wValue);
                switch (wValue) {
@@ -2773,11 +2758,8 @@ static int u132_roothub_clearportfeature(struct u132 *u132, u16 wValue,
                default:
                        return -EPIPE;
                }
-               retval = u132_write_pcimem(u132, roothub.portstatus[port_index],
-                        temp);
-               if (retval)
-                       return retval;
-               return 0;
+               return u132_write_pcimem(u132, roothub.portstatus[port_index],
+                      temp);
        }
 }