diff options
-rw-r--r-- | drivers/net/can/at91_can.c | 2 | ||||
-rw-r--r-- | drivers/net/can/c_can/c_can_platform.c | 2 | ||||
-rw-r--r-- | drivers/net/can/flexcan.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c index dbbe97ae121e..3b1ff6148702 100644 --- a/drivers/net/can/at91_can.c +++ b/drivers/net/can/at91_can.c | |||
@@ -1355,7 +1355,7 @@ static int at91_can_probe(struct platform_device *pdev) | |||
1355 | if (at91_is_sam9263(priv)) | 1355 | if (at91_is_sam9263(priv)) |
1356 | dev->sysfs_groups[0] = &at91_sysfs_attr_group; | 1356 | dev->sysfs_groups[0] = &at91_sysfs_attr_group; |
1357 | 1357 | ||
1358 | dev_set_drvdata(&pdev->dev, dev); | 1358 | platform_set_drvdata(pdev, dev); |
1359 | SET_NETDEV_DEV(dev, &pdev->dev); | 1359 | SET_NETDEV_DEV(dev, &pdev->dev); |
1360 | 1360 | ||
1361 | err = register_candev(dev); | 1361 | err = register_candev(dev); |
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index c6f838d922a5..294ced3cc227 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c | |||
@@ -195,7 +195,7 @@ static int c_can_plat_probe(struct platform_device *pdev) | |||
195 | 195 | ||
196 | res = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 196 | res = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
197 | priv->raminit_ctrlreg = devm_ioremap_resource(&pdev->dev, res); | 197 | priv->raminit_ctrlreg = devm_ioremap_resource(&pdev->dev, res); |
198 | if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0) | 198 | if (IS_ERR(priv->raminit_ctrlreg) || (int)priv->instance < 0) |
199 | dev_info(&pdev->dev, "control memory is not used for raminit\n"); | 199 | dev_info(&pdev->dev, "control memory is not used for raminit\n"); |
200 | else | 200 | else |
201 | priv->raminit = c_can_hw_raminit; | 201 | priv->raminit = c_can_hw_raminit; |
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index c48174ed49cc..71c677e651d7 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c | |||
@@ -1083,7 +1083,7 @@ static int flexcan_probe(struct platform_device *pdev) | |||
1083 | 1083 | ||
1084 | netif_napi_add(dev, &priv->napi, flexcan_poll, FLEXCAN_NAPI_WEIGHT); | 1084 | netif_napi_add(dev, &priv->napi, flexcan_poll, FLEXCAN_NAPI_WEIGHT); |
1085 | 1085 | ||
1086 | dev_set_drvdata(&pdev->dev, dev); | 1086 | platform_set_drvdata(pdev, dev); |
1087 | SET_NETDEV_DEV(dev, &pdev->dev); | 1087 | SET_NETDEV_DEV(dev, &pdev->dev); |
1088 | 1088 | ||
1089 | err = register_flexcandev(dev); | 1089 | err = register_flexcandev(dev); |