Merge tag 'linux-can-next-for-4.6-20160226' of git://git.kernel.org/pub/scm/linux...

Marc Kleine-Budde says:

====================
pull-request: can-next 2016-02-26

this is a pull request of 3 patch for net-next/master.

There are two patches by Simon Horman, in which the device tree support
for the rcar_can driver is improved. One patch by me fixes the bad
coding style of the ems_usb driver which was introduced recently.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/devicetree/bindings/net/can/rcar_can.txt b/Documentation/devicetree/bindings/net/can/rcar_can.txt
index 002d844..65edc05 100644 (file)
--- a/Documentation/devicetree/bindings/net/can/rcar_can.txt
+++ b/Documentation/devicetree/bindings/net/can/rcar_can.txt
@@ -6,6 +6,15 @@ Required properties:
              "renesas,can-r8a7779" if CAN controller is a part of R8A7779 SoC.
              "renesas,can-r8a7790" if CAN controller is a part of R8A7790 SoC.
              "renesas,can-r8a7791" if CAN controller is a part of R8A7791 SoC.
+             "renesas,can-r8a7792" if CAN controller is a part of R8A7792 SoC.
+             "renesas,can-r8a7793" if CAN controller is a part of R8A7793 SoC.
+             "renesas,can-r8a7794" if CAN controller is a part of R8A7794 SoC.
+             "renesas,rcar-gen1-can" for a generic R-Car Gen1 compatible device.
+             "renesas,rcar-gen2-can" for a generic R-Car Gen2 compatible device.
+             When compatible with the generic version, nodes must list the
+             SoC-specific version corresponding to the platform first
+             followed by the generic version.
+
 - reg: physical base address and size of the R-Car CAN register map.
 - interrupts: interrupt specifier for the sole interrupt.
 - clocks: phandles and clock specifiers for 3 CAN clock inputs.
@@ -25,7 +34,7 @@ Example
 SoC common .dtsi file:
 
        can0: can@e6e80000 {
-               compatible = "renesas,can-r8a7791";
+               compatible = "renesas,can-r8a7791", "renesas,rcar-gen2-can";
                reg = <0 0xe6e80000 0 0x1000>;
                interrupts = <0 186 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&mstp9_clks R8A7791_CLK_RCAN0>,

diff --git a/drivers/net/can/rcar_can.c b/drivers/net/can/rcar_can.c
index bc46be3..ad3d2e0 100644 (file)
--- a/drivers/net/can/rcar_can.c
+++ b/drivers/net/can/rcar_can.c
@@ -904,6 +904,8 @@ static const struct of_device_id rcar_can_of_table[] __maybe_unused = {
        { .compatible = "renesas,can-r8a7779" },
        { .compatible = "renesas,can-r8a7790" },
        { .compatible = "renesas,can-r8a7791" },
+       { .compatible = "renesas,rcar-gen1-can" },
+       { .compatible = "renesas,rcar-gen2-can" },
        { }
 };
 MODULE_DEVICE_TABLE(of, rcar_can_of_table);

diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index eb7192f..3400fd1 100644 (file)
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -281,11 +281,9 @@ static void ems_usb_read_interrupt_callback(struct urb *urb)
        switch (urb->status) {
        case 0:
                dev->free_slots = dev->intr_in_buffer[1];
-               if(dev->free_slots > CPC_TX_QUEUE_TRIGGER_HIGH){
-                       if (netif_queue_stopped(netdev)){
-                               netif_wake_queue(netdev);
-                       }
-               }
+               if (dev->free_slots > CPC_TX_QUEUE_TRIGGER_HIGH &&
+                   netif_queue_stopped(netdev))
+                       netif_wake_queue(netdev);
                break;
 
        case -ECONNRESET: /* unlink */