diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-27 02:42:01 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-27 02:42:01 +0300 |
| commit | 707d79e5cdcf7833d31fea9712f11b185ce25822 (patch) | |
| tree | 6bcdc972de744e7c7129a599dba5bd12403d46b5 /drivers/net/can/flexcan.c | |
| parent | 4141d93fc55a33bbe74c9de48f1f99dd85bf0441 (diff) | |
| parent | ef186f25fdf00d92c6bd5d3301fc0ee44f17ca33 (diff) | |
| download | linux-707d79e5cdcf7833d31fea9712f11b185ce25822.tar.xz | |
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>
Diffstat (limited to 'drivers/net/can/flexcan.c')
| -rw-r--r-- | drivers/net/can/flexcan.c | 2 |
1 files changed, 0 insertions, 2 deletions
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); |