aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/flexcan.c
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2014-03-04 16:04:22 -0500
committerMarc Kleine-Budde <mkl@pengutronix.de>2014-03-06 16:20:44 -0500
commitd0873e6fc06686cf2dfb9adabb6ca65e9967c60f (patch)
treec33324a15d2626ebc3f37cfe428236e4df034c21 /drivers/net/can/flexcan.c
parent08c6d35154069becb01243176fb72b3bc60ff3cb (diff)
can: flexcan: make use of platform_get_device_id()
This patch replaces an open coded pdev->id_entry by platform_get_device_id(). Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/flexcan.c')
-rw-r--r--drivers/net/can/flexcan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index efa1bbc9a1ec..c94d698b73c2 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -1132,9 +1132,9 @@ static int flexcan_probe(struct platform_device *pdev)
1132 of_id = of_match_device(flexcan_of_match, &pdev->dev); 1132 of_id = of_match_device(flexcan_of_match, &pdev->dev);
1133 if (of_id) { 1133 if (of_id) {
1134 devtype_data = of_id->data; 1134 devtype_data = of_id->data;
1135 } else if (pdev->id_entry->driver_data) { 1135 } else if (platform_get_device_id(pdev)->driver_data) {
1136 devtype_data = (struct flexcan_devtype_data *) 1136 devtype_data = (struct flexcan_devtype_data *)
1137 pdev->id_entry->driver_data; 1137 platform_get_device_id(pdev)->driver_data;
1138 } else { 1138 } else {
1139 return -ENODEV; 1139 return -ENODEV;
1140 } 1140 }