Browse Source

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>
Axel Lin 10 years ago
parent
commit
5e4cb7b608
3 changed files with 4 additions and 2 deletions
  1. 2 1
      sound/soc/codecs/cs42xx8-i2c.c
  2. 1 1
      sound/soc/codecs/cs42xx8.c
  3. 1 0
      sound/soc/codecs/cs42xx8.h

+ 2 - 1
sound/soc/codecs/cs42xx8-i2c.c

@@ -20,7 +20,7 @@
 static int cs42xx8_i2c_probe(struct i2c_client *i2c,
 static int cs42xx8_i2c_probe(struct i2c_client *i2c,
 			     const struct i2c_device_id *id)
 			     const struct i2c_device_id *id)
 {
 {
-	u32 ret = cs42xx8_probe(&i2c->dev,
+	int ret = cs42xx8_probe(&i2c->dev,
 			devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config));
 			devm_regmap_init_i2c(i2c, &cs42xx8_regmap_config));
 	if (ret)
 	if (ret)
 		return ret;
 		return ret;
@@ -51,6 +51,7 @@ static struct i2c_driver cs42xx8_i2c_driver = {
 		.name = "cs42xx8",
 		.name = "cs42xx8",
 		.owner = THIS_MODULE,
 		.owner = THIS_MODULE,
 		.pm = &cs42xx8_pm,
 		.pm = &cs42xx8_pm,
+		.of_match_table = cs42xx8_of_match,
 	},
 	},
 	.probe = cs42xx8_i2c_probe,
 	.probe = cs42xx8_i2c_probe,
 	.remove = cs42xx8_i2c_remove,
 	.remove = cs42xx8_i2c_remove,

+ 1 - 1
sound/soc/codecs/cs42xx8.c

@@ -425,7 +425,7 @@ const struct cs42xx8_driver_data cs42888_data = {
 };
 };
 EXPORT_SYMBOL_GPL(cs42888_data);
 EXPORT_SYMBOL_GPL(cs42888_data);
 
 
-static const struct of_device_id cs42xx8_of_match[] = {
+const struct of_device_id cs42xx8_of_match[] = {
 	{ .compatible = "cirrus,cs42448", .data = &cs42448_data, },
 	{ .compatible = "cirrus,cs42448", .data = &cs42448_data, },
 	{ .compatible = "cirrus,cs42888", .data = &cs42888_data, },
 	{ .compatible = "cirrus,cs42888", .data = &cs42888_data, },
 	{ /* sentinel */ }
 	{ /* sentinel */ }

+ 1 - 0
sound/soc/codecs/cs42xx8.h

@@ -22,6 +22,7 @@ extern const struct dev_pm_ops cs42xx8_pm;
 extern const struct cs42xx8_driver_data cs42448_data;
 extern const struct cs42xx8_driver_data cs42448_data;
 extern const struct cs42xx8_driver_data cs42888_data;
 extern const struct cs42xx8_driver_data cs42888_data;
 extern const struct regmap_config cs42xx8_regmap_config;
 extern const struct regmap_config cs42xx8_regmap_config;
+extern const struct of_device_id cs42xx8_of_match[];
 int cs42xx8_probe(struct device *dev, struct regmap *regmap);
 int cs42xx8_probe(struct device *dev, struct regmap *regmap);
 
 
 /* CS42888 register map */
 /* CS42888 register map */