| Message ID | 20230910160126.70122-3-biju.das.jz@bp.renesas.com |
|---|---|
| State | Accepted |
| Commit | 8c8389bba49d8cd0ffc5bf2b27cb3233268a45d5 |
| Headers | show |
| Series | None | expand |
Hi Biju On Sun, Sep 10, 2023 at 05:01:26PM +0100, Biju Das wrote: > Drop of_match_ptr() from mt9p031_i2c_driver and get rid of ugly CONFIG_OF > if check. This slightly increases the size of mt9p031_i2c_driver on non-OF > system and shouldn't be an issue. > > Add mod_devicetable.h include. > > It also allows, in case if needed, to enumerate this device via ACPI with > PRP0001 magic. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Thanks j > --- > drivers/media/i2c/mt9p031.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c > index 540cb519915c..91d5de5b95f0 100644 > --- a/drivers/media/i2c/mt9p031.c > +++ b/drivers/media/i2c/mt9p031.c > @@ -15,6 +15,7 @@ > #include <linux/gpio/consumer.h> > #include <linux/i2c.h> > #include <linux/log2.h> > +#include <linux/mod_devicetable.h> > #include <linux/module.h> > #include <linux/of.h> > #include <linux/of_graph.h> > @@ -1222,7 +1223,6 @@ static const struct i2c_device_id mt9p031_id[] = { > }; > MODULE_DEVICE_TABLE(i2c, mt9p031_id); > > -#if IS_ENABLED(CONFIG_OF) > static const struct of_device_id mt9p031_of_match[] = { > { .compatible = "aptina,mt9p006", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 }, > { .compatible = "aptina,mt9p031", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 }, > @@ -1230,11 +1230,10 @@ static const struct of_device_id mt9p031_of_match[] = { > { /* sentinel */ } > }; > MODULE_DEVICE_TABLE(of, mt9p031_of_match); > -#endif > > static struct i2c_driver mt9p031_i2c_driver = { > .driver = { > - .of_match_table = of_match_ptr(mt9p031_of_match), > + .of_match_table = mt9p031_of_match, > .name = "mt9p031", > }, > .probe = mt9p031_probe, > -- > 2.25.1 >
Hi Biju, Thank you for the patch. On Sun, Sep 10, 2023 at 05:01:26PM +0100, Biju Das wrote: > Drop of_match_ptr() from mt9p031_i2c_driver and get rid of ugly CONFIG_OF > if check. This slightly increases the size of mt9p031_i2c_driver on non-OF > system and shouldn't be an issue. > > Add mod_devicetable.h include. > > It also allows, in case if needed, to enumerate this device via ACPI with > PRP0001 magic. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > drivers/media/i2c/mt9p031.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c > index 540cb519915c..91d5de5b95f0 100644 > --- a/drivers/media/i2c/mt9p031.c > +++ b/drivers/media/i2c/mt9p031.c > @@ -15,6 +15,7 @@ > #include <linux/gpio/consumer.h> > #include <linux/i2c.h> > #include <linux/log2.h> > +#include <linux/mod_devicetable.h> > #include <linux/module.h> > #include <linux/of.h> > #include <linux/of_graph.h> > @@ -1222,7 +1223,6 @@ static const struct i2c_device_id mt9p031_id[] = { > }; > MODULE_DEVICE_TABLE(i2c, mt9p031_id); > > -#if IS_ENABLED(CONFIG_OF) > static const struct of_device_id mt9p031_of_match[] = { > { .compatible = "aptina,mt9p006", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 }, > { .compatible = "aptina,mt9p031", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 }, > @@ -1230,11 +1230,10 @@ static const struct of_device_id mt9p031_of_match[] = { > { /* sentinel */ } > }; > MODULE_DEVICE_TABLE(of, mt9p031_of_match); > -#endif > > static struct i2c_driver mt9p031_i2c_driver = { > .driver = { > - .of_match_table = of_match_ptr(mt9p031_of_match), > + .of_match_table = mt9p031_of_match, > .name = "mt9p031", > }, > .probe = mt9p031_probe,
diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index 540cb519915c..91d5de5b95f0 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -15,6 +15,7 @@ #include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/log2.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_graph.h> @@ -1222,7 +1223,6 @@ static const struct i2c_device_id mt9p031_id[] = { }; MODULE_DEVICE_TABLE(i2c, mt9p031_id); -#if IS_ENABLED(CONFIG_OF) static const struct of_device_id mt9p031_of_match[] = { { .compatible = "aptina,mt9p006", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 }, { .compatible = "aptina,mt9p031", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 }, @@ -1230,11 +1230,10 @@ static const struct of_device_id mt9p031_of_match[] = { { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, mt9p031_of_match); -#endif static struct i2c_driver mt9p031_i2c_driver = { .driver = { - .of_match_table = of_match_ptr(mt9p031_of_match), + .of_match_table = mt9p031_of_match, .name = "mt9p031", }, .probe = mt9p031_probe,
Drop of_match_ptr() from mt9p031_i2c_driver and get rid of ugly CONFIG_OF if check. This slightly increases the size of mt9p031_i2c_driver on non-OF system and shouldn't be an issue. Add mod_devicetable.h include. It also allows, in case if needed, to enumerate this device via ACPI with PRP0001 magic. Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- drivers/media/i2c/mt9p031.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)