| Message ID | 1424283959-16289-3-git-send-email-afaerber@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 02/18/2015 09:25 PM, Andreas Färber wrote: > "maxim,max98089" will be used for the Spring Chromebook. > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > sound/soc/codecs/max98088.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c > index 805b3f8cd39d..69a21d1946e3 100644 > --- a/sound/soc/codecs/max98088.c > +++ b/sound/soc/codecs/max98088.c > @@ -2009,10 +2009,18 @@ static const struct i2c_device_id max98088_i2c_id[] = { > }; > MODULE_DEVICE_TABLE(i2c, max98088_i2c_id); > > +static const struct of_device_id max98088_of_match[] = { If I don't mistake, gcc will complain about this variable being unused if CONFIG_OF=n. > + { .compatible = "maxim,max98088" }, > + { .compatible = "maxim,max98089" }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, max98088_of_match); > + > static struct i2c_driver max98088_i2c_driver = { > .driver = { > .name = "max98088", > .owner = THIS_MODULE, > + .of_match_table = of_match_ptr(max98088_of_match), You probably don;t need of_match_ptr(). Either that or do something with the match table, like enclosing into #ifdef or annotating with '__maybe_unused'. [...] WBR, Sergei
Hi, Am 18.02.2015 um 20:08 schrieb Sergei Shtylyov: > On 02/18/2015 09:25 PM, Andreas Färber wrote: > >> "maxim,max98089" will be used for the Spring Chromebook. > >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> --- >> sound/soc/codecs/max98088.c | 8 ++++++++ >> 1 file changed, 8 insertions(+) > >> diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c >> index 805b3f8cd39d..69a21d1946e3 100644 >> --- a/sound/soc/codecs/max98088.c >> +++ b/sound/soc/codecs/max98088.c >> @@ -2009,10 +2009,18 @@ static const struct i2c_device_id >> max98088_i2c_id[] = { >> }; >> MODULE_DEVICE_TABLE(i2c, max98088_i2c_id); >> >> +static const struct of_device_id max98088_of_match[] = { > > If I don't mistake, gcc will complain about this variable being > unused if CONFIG_OF=n. I assume there will be no warning because of the "const". For just "static" you would be right. >> + { .compatible = "maxim,max98088" }, >> + { .compatible = "maxim,max98089" }, >> + { } >> +}; >> +MODULE_DEVICE_TABLE(of, max98088_of_match); >> + >> static struct i2c_driver max98088_i2c_driver = { >> .driver = { >> .name = "max98088", >> .owner = THIS_MODULE, >> + .of_match_table = of_match_ptr(max98088_of_match), > > You probably don;t need of_match_ptr(). Either that or do something > with the match table, like enclosing into #ifdef or annotating with > '__maybe_unused'. This was copied from max98090 and max98095. Cheers, Andreas
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 805b3f8cd39d..69a21d1946e3 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -2009,10 +2009,18 @@ static const struct i2c_device_id max98088_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, max98088_i2c_id); +static const struct of_device_id max98088_of_match[] = { + { .compatible = "maxim,max98088" }, + { .compatible = "maxim,max98089" }, + { } +}; +MODULE_DEVICE_TABLE(of, max98088_of_match); + static struct i2c_driver max98088_i2c_driver = { .driver = { .name = "max98088", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(max98088_of_match), }, .probe = max98088_i2c_probe, .remove = max98088_i2c_remove,
"maxim,max98089" will be used for the Spring Chromebook. Signed-off-by: Andreas Färber <afaerber@suse.de> --- sound/soc/codecs/max98088.c | 8 ++++++++ 1 file changed, 8 insertions(+)