diff options
| author | David S. Miller <davem@davemloft.net> | 2013-09-30 22:31:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-30 22:31:05 -0700 |
| commit | d9a71f97d5ad4ac912e0bb60813ae992da1e18b2 (patch) | |
| tree | b4f805beae8db5b8935d0ef434f88bf6ea7b86a9 /drivers/net | |
| parent | 9260d3e1013701aa814d10c8fc6a9f92bd17d643 (diff) | |
| parent | 0d1862ea1a5bb876cf05555a7307080cb75bf379 (diff) | |
| download | linux-d9a71f97d5ad4ac912e0bb60813ae992da1e18b2.tar.gz linux-d9a71f97d5ad4ac912e0bb60813ae992da1e18b2.tar.bz2 linux-d9a71f97d5ad4ac912e0bb60813ae992da1e18b2.zip | |
Merge branch 'fixes-for-3.12' of git://gitorious.org/linux-can/linux-can
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/can/flexcan.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 71c677e651d7..3f21142138b7 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -702,7 +702,6 @@ static int flexcan_chip_start(struct net_device *dev) { struct flexcan_priv *priv = netdev_priv(dev); struct flexcan_regs __iomem *regs = priv->base; - unsigned int i; int err; u32 reg_mcr, reg_ctrl; @@ -772,17 +771,6 @@ static int flexcan_chip_start(struct net_device *dev) netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl); flexcan_write(reg_ctrl, ®s->ctrl); - for (i = 0; i < ARRAY_SIZE(regs->cantxfg); i++) { - flexcan_write(0, ®s->cantxfg[i].can_ctrl); - flexcan_write(0, ®s->cantxfg[i].can_id); - flexcan_write(0, ®s->cantxfg[i].data[0]); - flexcan_write(0, ®s->cantxfg[i].data[1]); - - /* put MB into rx queue */ - flexcan_write(FLEXCAN_MB_CNT_CODE(0x4), - ®s->cantxfg[i].can_ctrl); - } - /* acceptance mask/acceptance code (accept everything) */ flexcan_write(0x0, ®s->rxgmask); flexcan_write(0x0, ®s->rx14mask); |