From: Sachin Kamat Date: Wed, 19 Dec 2012 01:17:10 +0000 (+0000) Subject: drivers/net: Use of_match_ptr() macro in smsc911x.c X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d62fdf8b681550881b3fb85f335eaf8e36b971b7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drivers/net: Use of_match_ptr() macro in smsc911x.c Add CONFIG_OF guard and use of_match_ptr macro. Signed-off-by: Sachin Kamat Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 4616bf27d515..e112877d15d3 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -2575,11 +2575,13 @@ static const struct dev_pm_ops smsc911x_pm_ops = { #define SMSC911X_PM_OPS NULL #endif +#ifdef CONFIG_OF static const struct of_device_id smsc911x_dt_ids[] = { { .compatible = "smsc,lan9115", }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, smsc911x_dt_ids); +#endif static struct platform_driver smsc911x_driver = { .probe = smsc911x_drv_probe, @@ -2588,7 +2590,7 @@ static struct platform_driver smsc911x_driver = { .name = SMSC_CHIPNAME, .owner = THIS_MODULE, .pm = SMSC911X_PM_OPS, - .of_match_table = smsc911x_dt_ids, + .of_match_table = of_match_ptr(smsc911x_dt_ids), }, };