Skip to content

Commit

Permalink
iio: light: gp2ap020a00f: Swap of.h for mod_devicetable.h + drop of_m…
Browse files Browse the repository at this point in the history
…atch_ptr

Also drops ifdef protections for CONFIG_OF.

Enables probing via ACPI PRP0001 and removes an example that might be
cut and paste into new drivers.

Signed-off-by: Jonathan Cameron <[email protected]>
Reviewed-by: Alexandru Ardelean <[email protected]>
  • Loading branch information
jic23 committed Apr 25, 2020
1 parent 1de94b5 commit de1cbfe
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/iio/light/gp2ap020a00f.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
#include <linux/irq.h>
#include <linux/irq_work.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/mutex.h>
#include <linux/of.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
#include <linux/slab.h>
Expand Down Expand Up @@ -1617,18 +1617,16 @@ static const struct i2c_device_id gp2ap020a00f_id[] = {

MODULE_DEVICE_TABLE(i2c, gp2ap020a00f_id);

#ifdef CONFIG_OF
static const struct of_device_id gp2ap020a00f_of_match[] = {
{ .compatible = "sharp,gp2ap020a00f" },
{ }
};
MODULE_DEVICE_TABLE(of, gp2ap020a00f_of_match);
#endif

static struct i2c_driver gp2ap020a00f_driver = {
.driver = {
.name = GP2A_I2C_NAME,
.of_match_table = of_match_ptr(gp2ap020a00f_of_match),
.of_match_table = gp2ap020a00f_of_match,
},
.probe = gp2ap020a00f_probe,
.remove = gp2ap020a00f_remove,
Expand Down

0 comments on commit de1cbfe

Please sign in to comment.