Skip to content

Commit

Permalink
ASoC: cs42xx8: Only define cs42xx8_of_match once
Browse files Browse the repository at this point in the history
cs42xx8.c exports cs42xx8_of_match, so there's no need to redefine it
in cs42xx8-i2c.c - doing so breaks linking when loadable module
support is disabled. It would be tidy to use the exported match table
in cs42xx8.c's of_match_table member, but an imported symbol can't be
used in a module's MODULE_DEVICE_TABLE declaration. Instead, rename
the duplicated declarations so as not to clash.

See: #3873

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  • Loading branch information
pelwell authored and popcornmix committed Oct 16, 2020
1 parent 691608f commit 7277a33
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sound/soc/codecs/cs42xx8-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@ static struct i2c_device_id cs42xx8_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, cs42xx8_i2c_id);

const struct of_device_id cs42xx8_of_match[] = {
const struct of_device_id cs42xx8_i2c_of_match[] = {
{ .compatible = "cirrus,cs42448", .data = &cs42448_data, },
{ .compatible = "cirrus,cs42888", .data = &cs42888_data, },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, cs42xx8_of_match);
MODULE_DEVICE_TABLE(of, cs42xx8_i2c_of_match);

static struct i2c_driver cs42xx8_i2c_driver = {
.driver = {
.name = "cs42xx8",
.pm = &cs42xx8_pm,
.of_match_table = cs42xx8_of_match,
.of_match_table = cs42xx8_i2c_of_match,
},
.probe = cs42xx8_i2c_probe,
.remove = cs42xx8_i2c_remove,
Expand Down

0 comments on commit 7277a33

Please # to comment.