aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-06-25 09:44:13 -0400
committerMark Brown <broonie@kernel.org>2015-07-07 08:35:13 -0400
commit5e4cb7b60833b0124a9f71dbc5118144ca79c3c4 (patch)
treebc814d4d1a2c5b0c848e205e48ec6be35058815d
parentd375d0abcd625cd09cd90a252ad22a1085452e3c (diff)
ASoC: cs42xx8: Setup of_match_table
Setup of_match_table and since cs42xx8_of_match is exported and used in cs42xx8-i2c.c, it cannot be static. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Brian Austin <brian.austin@cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/cs42xx8-i2c.c3
-rw-r--r--sound/soc/codecs/cs42xx8.c2
-rw-r--r--sound/soc/codecs/cs42xx8.h1
3 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c
index 657dce27eade..5a71c9e5b441 100644
--- a/sound/soc/codecs/cs42xx8-i2c.c
+++ b/sound/soc/codecs/cs42xx8-i2c.c
@@ -20,7 +20,7 @@
20static int cs42xx8_i2c_probe(struct i2c_client *i2c, 20static int cs42xx8_i2c_probe(struct i2c_client *i2c,
21 const struct i2c_device_id *id) 21 const struct i2c_device_id *id)
22{ 22{
23 u32 ret = cs42xx8_probe(&i2c->dev, 23 int ret = cs42xx8_probe(&i2c->dev,
24 devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config)); 24 devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config));
25 if (ret) 25 if (ret)
26 return ret; 26 return ret;
@@ -51,6 +51,7 @@ static struct i2c_driver cs42xx8_i2c_driver = {
51 .name = "cs42xx8", 51 .name = "cs42xx8",
52 .owner = THIS_MODULE, 52 .owner = THIS_MODULE,
53 .pm = &cs42xx8_pm, 53 .pm = &cs42xx8_pm,
54 .of_match_table = cs42xx8_of_match,
54 }, 55 },
55 .probe = cs42xx8_i2c_probe, 56 .probe = cs42xx8_i2c_probe,
56 .remove = cs42xx8_i2c_remove, 57 .remove = cs42xx8_i2c_remove,
diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
index ab395144b232..d562e1b9a5d1 100644
--- a/sound/soc/codecs/cs42xx8.c
+++ b/sound/soc/codecs/cs42xx8.c
@@ -425,7 +425,7 @@ const struct cs42xx8_driver_data cs42888_data = {
425}; 425};
426EXPORT_SYMBOL_GPL(cs42888_data); 426EXPORT_SYMBOL_GPL(cs42888_data);
427 427
428static const struct of_device_id cs42xx8_of_match[] = { 428const struct of_device_id cs42xx8_of_match[] = {
429 { .compatible = "cirrus,cs42448", .data = &cs42448_data, }, 429 { .compatible = "cirrus,cs42448", .data = &cs42448_data, },
430 { .compatible = "cirrus,cs42888", .data = &cs42888_data, }, 430 { .compatible = "cirrus,cs42888", .data = &cs42888_data, },
431 { /* sentinel */ } 431 { /* sentinel */ }
diff --git a/sound/soc/codecs/cs42xx8.h b/sound/soc/codecs/cs42xx8.h
index b2c10e537ef6..d36c61b6df74 100644
--- a/sound/soc/codecs/cs42xx8.h
+++ b/sound/soc/codecs/cs42xx8.h
@@ -22,6 +22,7 @@ extern const struct dev_pm_ops cs42xx8_pm;
22extern const struct cs42xx8_driver_data cs42448_data; 22extern const struct cs42xx8_driver_data cs42448_data;
23extern const struct cs42xx8_driver_data cs42888_data; 23extern const struct cs42xx8_driver_data cs42888_data;
24extern const struct regmap_config cs42xx8_regmap_config; 24extern const struct regmap_config cs42xx8_regmap_config;
25extern const struct of_device_id cs42xx8_of_match[];
25int cs42xx8_probe(struct device *dev, struct regmap *regmap); 26int cs42xx8_probe(struct device *dev, struct regmap *regmap);
26 27
27/* CS42888 register map */ 28/* CS42888 register map */