Message ID | 20170802232504.GA15256@arbeit |
---|---|
State | Not Applicable |
Headers | show |
On Thu, 3 Aug 2017 01:25:04 +0200 Andreas Klinger <ak@it-klinger.de> wrote: > Added MODULE_DEVICE_TABLE for device tree bindings. > > It used to work without it by using the i2c_device_id table, but adding the > table makes everything clear and documented. > > Signed-off-by: Andreas Klinger <ak@it-klinger.de> Looks fine. Will pick up once the rest are sorted. Jonathan > --- > drivers/iio/proximity/srf08.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/iio/proximity/srf08.c b/drivers/iio/proximity/srf08.c > index 92e1799c430c..a2913a5bf68e 100644 > --- a/drivers/iio/proximity/srf08.c > +++ b/drivers/iio/proximity/srf08.c > @@ -455,6 +455,14 @@ static int srf08_probe(struct i2c_client *client, > return devm_iio_device_register(&client->dev, indio_dev); > } > > +static const struct of_device_id of_srf08_match[] = { > + { .compatible = "devantech,srf08", (void *)SRF08}, > + { .compatible = "devantech,srf10", (void *)SRF10}, > + {}, > +}; > + > +MODULE_DEVICE_TABLE(of, of_srf08_match); > + > static const struct i2c_device_id srf08_id[] = { > { "srf08", SRF08 }, > { "srf10", SRF10 }, > @@ -465,6 +473,7 @@ MODULE_DEVICE_TABLE(i2c, srf08_id); > static struct i2c_driver srf08_driver = { > .driver = { > .name = "srf08", > + .of_match_table = of_srf08_match, > }, > .probe = srf08_probe, > .id_table = srf08_id,
diff --git a/drivers/iio/proximity/srf08.c b/drivers/iio/proximity/srf08.c index 92e1799c430c..a2913a5bf68e 100644 --- a/drivers/iio/proximity/srf08.c +++ b/drivers/iio/proximity/srf08.c @@ -455,6 +455,14 @@ static int srf08_probe(struct i2c_client *client, return devm_iio_device_register(&client->dev, indio_dev); } +static const struct of_device_id of_srf08_match[] = { + { .compatible = "devantech,srf08", (void *)SRF08}, + { .compatible = "devantech,srf10", (void *)SRF10}, + {}, +}; + +MODULE_DEVICE_TABLE(of, of_srf08_match); + static const struct i2c_device_id srf08_id[] = { { "srf08", SRF08 }, { "srf10", SRF10 }, @@ -465,6 +473,7 @@ MODULE_DEVICE_TABLE(i2c, srf08_id); static struct i2c_driver srf08_driver = { .driver = { .name = "srf08", + .of_match_table = of_srf08_match, }, .probe = srf08_probe, .id_table = srf08_id,
Added MODULE_DEVICE_TABLE for device tree bindings. It used to work without it by using the i2c_device_id table, but adding the table makes everything clear and documented. Signed-off-by: Andreas Klinger <ak@it-klinger.de> --- drivers/iio/proximity/srf08.c | 9 +++++++++ 1 file changed, 9 insertions(+)