Merge tag 'linux-can-next-for-3.20-20150121' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2015-21-01

this is a pull request of 4 patches for net-next/master.

Andri Yngvason contributes one patch to further consolidate the CAN
state change handling. The next patch is by kbuild test robot/Fengguang
Wu which fixes a coccinelle warning in the CAN infrastructure. The two
last patches are by me, they remove a unused variable from the flexcan
and at91_can driver.
====================

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

18 files changed, 18 insertions, 7 deletions

diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index d0c2463b573f..eeb4b8b6b335 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -138,7 +138,6 @@ struct at91_devtype_data {
 
 struct at91_priv {
         struct can_priv can;            /* must be the first member! */
-        struct net_device *dev;
         struct napi_struct napi;
 
         void __iomem *reg_base;
@@ -1350,7 +1349,6 @@ static int at91_can_probe(struct platform_device *pdev)
         priv->can.do_get_berr_counter = at91_get_berr_counter;
         priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |
                 CAN_CTRLMODE_LISTENONLY;
-        priv->dev = dev;
         priv->reg_base = addr;
         priv->devtype_data = *devtype_data;
         priv->clk = clk;
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index 417d50998e31..e7a6363e736b 100644
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -352,6 +352,7 @@ static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status)
                 netdev_dbg(dev, "bus-off mode interrupt\n");
                 state = CAN_STATE_BUS_OFF;
                 cf->can_id |= CAN_ERR_BUSOFF;
+                priv->can.can_stats.bus_off++;
                 can_bus_off(dev);
         }
 
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index f94a9fa60488..70f77e96d409 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -866,7 +866,7 @@ static int c_can_handle_state_change(struct net_device *dev,
         case C_CAN_BUS_OFF:
                 /* bus-off state */
                 priv->can.state = CAN_STATE_BUS_OFF;
-                can_bus_off(dev);
+                priv->can.can_stats.bus_off++;
                 break;
         default:
                 break;
diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c
index c486fe510f37..c11d44984036 100644
--- a/drivers/net/can/cc770/cc770.c
+++ b/drivers/net/can/cc770/cc770.c
@@ -535,6 +535,7 @@ static int cc770_err(struct net_device *dev, u8 status)
                 cc770_write_reg(priv, control, CTRL_INI);
                 cf->can_id |= CAN_ERR_BUSOFF;
                 priv->can.state = CAN_STATE_BUS_OFF;
+                priv->can.can_stats.bus_off++;
                 can_bus_off(dev);
         } else if (status & STAT_WARN) {
                 cf->can_id |= CAN_ERR_CRTL;
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 3ec8f6f25e5f..6ac02c8d747e 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -289,9 +289,11 @@ static void can_update_state_error_stats(struct net_device *dev,
                 priv->can_stats.error_passive++;
                 break;
         case CAN_STATE_BUS_OFF:
+                priv->can_stats.bus_off++;
+                break;
         default:
                 break;
-        };
+        }
 }
 
 static int can_tx_state_to_frame(struct net_device *dev, enum can_state state)
@@ -544,7 +546,6 @@ void can_bus_off(struct net_device *dev)
         netdev_dbg(dev, "bus-off\n");
 
         netif_carrier_off(dev);
-        priv->can_stats.bus_off++;
 
         if (priv->restart_ms)
                 mod_timer(&priv->restart_timer,
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index b1d583ba9674..80c46ad4cee4 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -247,7 +247,6 @@ struct flexcan_devtype_data {
 
 struct flexcan_priv {
         struct can_priv can;
-        struct net_device *dev;
         struct napi_struct napi;
 
         void __iomem *base;
@@ -1220,7 +1219,6 @@ static int flexcan_probe(struct platform_device *pdev)
                 CAN_CTRLMODE_LISTENONLY | CAN_CTRLMODE_3_SAMPLES |
                 CAN_CTRLMODE_BERR_REPORTING;
         priv->base = base;
-        priv->dev = dev;
         priv->clk_ipg = clk_ipg;
         priv->clk_per = clk_per;
         priv->pdata = dev_get_platdata(&pdev->dev);
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index 1b118394907f..0eb4d181ae4d 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1008,6 +1008,7 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
                 if (status & SR_BS) {
                         state = CAN_STATE_BUS_OFF;
                         cf->can_id |= CAN_ERR_BUSOFF;
+                        mod->can.can_stats.bus_off++;
                         can_bus_off(dev);
                 } else if (status & SR_ES) {
                         if (rxerr >= 128 || txerr >= 128)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index d7bc462aafdc..b2ecb6c5e94b 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -589,6 +589,7 @@ static int m_can_handle_state_change(struct net_device *dev,
                 /* bus-off state */
                 priv->can.state = CAN_STATE_BUS_OFF;
                 m_can_disable_all_interrupts(priv);
+                priv->can.can_stats.bus_off++;
                 can_bus_off(dev);
                 break;
         default:
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index a67eb01f3028..e187ca783da0 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -505,6 +505,7 @@ static void pch_can_error(struct net_device *ndev, u32 status)
                 pch_can_set_rx_all(priv, 0);
                 state = CAN_STATE_BUS_OFF;
                 cf->can_id |= CAN_ERR_BUSOFF;
+                priv->can.can_stats.bus_off++;
                 can_bus_off(ndev);
         }
 
diff --git a/drivers/net/can/rcar_can.c b/drivers/net/can/rcar_can.c
index 91cd48ca0efc..7deb80dcbe8c 100644
--- a/drivers/net/can/rcar_can.c
+++ b/drivers/net/can/rcar_can.c
@@ -331,6 +331,7 @@ static void rcar_can_error(struct net_device *ndev)
                 priv->can.state = CAN_STATE_BUS_OFF;
                 /* Clear interrupt condition */
                 writeb(~RCAR_CAN_EIFR_BOEIF, &priv->regs->eifr);
+                priv->can.can_stats.bus_off++;
                 can_bus_off(ndev);
                 if (skb)
                         cf->can_id |= CAN_ERR_BUSOFF;
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index 2bf98d862302..7621f91a8a20 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -261,6 +261,7 @@ static int softing_handle_1(struct softing *card)
                                 ++priv->can.can_stats.error_passive;
                         else if (can_state == CAN_STATE_BUS_OFF) {
                                 /* this calls can_close_cleanup() */
+                                ++priv->can.can_stats.bus_off;
                                 can_bus_off(netdev);
                                 netif_stop_queue(netdev);
                         }
diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c
index c66d699640a9..bf63fee4e743 100644
--- a/drivers/net/can/spi/mcp251x.c
+++ b/drivers/net/can/spi/mcp251x.c
@@ -905,6 +905,7 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)
                 if (priv->can.state == CAN_STATE_BUS_OFF) {
                         if (priv->can.restart_ms == 0) {
                                 priv->force_quit = 1;
+                                priv->can.can_stats.bus_off++;
                                 can_bus_off(net);
                                 mcp251x_hw_sleep(spi);
                                 break;
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 9a07eafe554b..e95a9e1a889f 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -715,6 +715,7 @@ static int ti_hecc_error(struct net_device *ndev, int int_status,
                 hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR);
                 /* Disable all interrupts in bus-off to avoid int hog */
                 hecc_write(priv, HECC_CANGIM, 0);
+                ++priv->can.can_stats.bus_off;
                 can_bus_off(ndev);
         }
 
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 29d3f0938eb8..9376f5e5b94e 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -347,6 +347,7 @@ static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg)
                         dev->can.state = CAN_STATE_BUS_OFF;
                         cf->can_id |= CAN_ERR_BUSOFF;
 
+                        dev->can.can_stats.bus_off++;
                         can_bus_off(dev->netdev);
                 } else if (state & SJA1000_SR_ES) {
                         dev->can.state = CAN_STATE_ERROR_WARNING;
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index c063a54ab8dd..bacca0bd89c1 100644
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -250,6 +250,7 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv,
                         case ESD_BUSSTATE_BUSOFF:
                                 priv->can.state = CAN_STATE_BUS_OFF;
                                 cf->can_id |= CAN_ERR_BUSOFF;
+                                priv->can.can_stats.bus_off++;
                                 can_bus_off(priv->netdev);
                                 break;
                         case ESD_BUSSTATE_WARN:
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c b/drivers/net/can/usb/peak_usb/pcan_usb.c
index 4e1659d07979..2a1c9ce53fae 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb.c
@@ -488,6 +488,7 @@ static int pcan_usb_decode_error(struct pcan_usb_msg_context *mc, u8 n,
         switch (new_state) {
         case CAN_STATE_BUS_OFF:
                 cf->can_id |= CAN_ERR_BUSOFF;
+                mc->pdev->dev.can.can_stats.bus_off++;
                 can_bus_off(mc->netdev);
                 break;
 
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
index 4cfa3b8605b1..145fa87c31b9 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c
@@ -634,6 +634,7 @@ static int pcan_usb_pro_handle_error(struct pcan_usb_pro_interface *usb_if,
         switch (new_state) {
         case CAN_STATE_BUS_OFF:
                 can_frame->can_id |= CAN_ERR_BUSOFF;
+                dev->can.can_stats.bus_off++;
                 can_bus_off(netdev);
                 break;
 
diff --git a/drivers/net/can/usb/usb_8dev.c b/drivers/net/can/usb/usb_8dev.c
index ef674ecb82f8..dd52c7a4c80d 100644
--- a/drivers/net/can/usb/usb_8dev.c
+++ b/drivers/net/can/usb/usb_8dev.c
@@ -377,6 +377,7 @@ static void usb_8dev_rx_err_msg(struct usb_8dev_priv *priv,
         case USB_8DEV_STATUSMSG_BUSOFF:
                 priv->can.state = CAN_STATE_BUS_OFF;
                 cf->can_id |= CAN_ERR_BUSOFF;
+                priv->can.can_stats.bus_off++;
                 can_bus_off(priv->netdev);
                 break;
         case USB_8DEV_STATUSMSG_OVERRUN: