diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-06-12 07:30:39 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-06-27 09:15:42 -0400 |
commit | 1f3e4b0cc4deb9d740261273fbbf5ea95c8434d0 (patch) | |
tree | 6f1170d002408309443fc8087cbb5694edc05824 /drivers/net/can/at91_can.c | |
parent | baffd2e8d9a562021f046ed52195aaac91a51412 (diff) |
can: at91_can: Use of_match_ptr()
of_match_ptr() eliminates having an #ifdef returning NULL for the case
when OF is disabled.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/at91_can.c')
-rw-r--r-- | drivers/net/can/at91_can.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c index ce8421ac453a..dbbe97ae121e 100644 --- a/drivers/net/can/at91_can.c +++ b/drivers/net/can/at91_can.c | |||
@@ -1264,8 +1264,6 @@ static const struct of_device_id at91_can_dt_ids[] = { | |||
1264 | } | 1264 | } |
1265 | }; | 1265 | }; |
1266 | MODULE_DEVICE_TABLE(of, at91_can_dt_ids); | 1266 | MODULE_DEVICE_TABLE(of, at91_can_dt_ids); |
1267 | #else | ||
1268 | #define at91_can_dt_ids NULL | ||
1269 | #endif | 1267 | #endif |
1270 | 1268 | ||
1271 | static const struct at91_devtype_data *at91_can_get_driver_data(struct platform_device *pdev) | 1269 | static const struct at91_devtype_data *at91_can_get_driver_data(struct platform_device *pdev) |
@@ -1424,7 +1422,7 @@ static struct platform_driver at91_can_driver = { | |||
1424 | .driver = { | 1422 | .driver = { |
1425 | .name = KBUILD_MODNAME, | 1423 | .name = KBUILD_MODNAME, |
1426 | .owner = THIS_MODULE, | 1424 | .owner = THIS_MODULE, |
1427 | .of_match_table = at91_can_dt_ids, | 1425 | .of_match_table = of_match_ptr(at91_can_dt_ids), |
1428 | }, | 1426 | }, |
1429 | .id_table = at91_can_id_table, | 1427 | .id_table = at91_can_id_table, |
1430 | }; | 1428 | }; |