Input: atmel_mxt_ts - use of_match_ptr rather than ifdefs

ndyer · ndyer · commit d62312df152b · 2014-06-19T01:05:45.000+01:00
Signed-off-by: Nick Dyer &lt;nick.dyer@itdev.co.uk&gt;
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -3342,15 +3342,11 @@ static int mxt_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume);
 
-#ifdef CONFIG_OF
 static const struct of_device_id mxt_of_match[] = {
 	{ .compatible = "atmel,maxtouch", },
 	{},
 };
 MODULE_DEVICE_TABLE(of, mxt_of_match);
-#else
-#define mxt_of_match NULL
-#endif
 
 static const struct i2c_device_id mxt_id[] = {
 	{ "qt602240_ts", 0 },
@@ -3365,7 +3361,7 @@ static struct i2c_driver mxt_driver = {
 	.driver = {
 		.name	= "atmel_mxt_ts",
 		.owner	= THIS_MODULE,
-		.of_match_table = mxt_of_match,
+		.of_match_table = of_match_ptr(mxt_of_match),
 		.pm	= &mxt_pm_ops,
 	},
 	.probe		= mxt_probe,
