From: Sachin Kamat Date: Wed, 12 Jun 2013 11:30:39 +0000 (+0530) Subject: can: at91_can: Use of_match_ptr() X-Git-Tag: firefly_0821_release~176^2~5751^2~91^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1f3e4b0cc4deb9d740261273fbbf5ea95c8434d0;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Marc Kleine-Budde --- 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[] = { } }; MODULE_DEVICE_TABLE(of, at91_can_dt_ids); -#else -#define at91_can_dt_ids NULL #endif 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 = { .driver = { .name = KBUILD_MODNAME, .owner = THIS_MODULE, - .of_match_table = at91_can_dt_ids, + .of_match_table = of_match_ptr(at91_can_dt_ids), }, .id_table = at91_can_id_table, };