Skip to content

Commit

Permalink
Input: atmel_mxt_ts - use of_match_ptr rather than ifdefs
Browse files Browse the repository at this point in the history
Signed-off-by: Nick Dyer <[email protected]>
  • Loading branch information
ndyer committed Jun 19, 2014
1 parent c7643a5 commit d62312d
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/input/touchscreen/atmel_mxt_ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand All @@ -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,
Expand Down

0 comments on commit d62312d

Please sign in to comment.