Merge tag 'asoc-v4.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / sound / soc / codecs / max9877.c

diff --git a/sound/soc/codecs/max9877.c b/sound/soc/codecs/max9877.c
index 9aac52d884a24c8433b40a65119f8cd08f7c8d04..61cc18e35efb958cef806f753d3a70d3cdbca62b 100644 (file)
--- a/sound/soc/codecs/max9877.c
+++ b/sound/soc/codecs/max9877.c
@@ -20,9 +20,7 @@
 
 #include "max9877.h"
 
-static struct regmap *regmap;
-
-static struct reg_default max9877_regs[] = {
+static const struct reg_default max9877_regs[] = {
        { 0, 0x40 },
        { 1, 0x00 },
        { 2, 0x00 },
@@ -121,7 +119,7 @@ static const struct snd_soc_dapm_route max9877_dapm_routes[] = {
        { "HPR", NULL, "SHDN" },
 };
 
-static const struct snd_soc_codec_driver max9877_codec = {
+static const struct snd_soc_component_driver max9877_component_driver = {
        .controls = max9877_controls,
        .num_controls = ARRAY_SIZE(max9877_controls),
 
@@ -143,6 +141,7 @@ static const struct regmap_config max9877_regmap = {
 static int max9877_i2c_probe(struct i2c_client *client,
                             const struct i2c_device_id *id)
 {
+       struct regmap *regmap;
        int i;
 
        regmap = devm_regmap_init_i2c(client, &max9877_regmap);
@@ -153,14 +152,8 @@ static int max9877_i2c_probe(struct i2c_client *client,
        for (i = 0; i < ARRAY_SIZE(max9877_regs); i++)
                regmap_write(regmap, max9877_regs[i].reg, max9877_regs[i].def);
 
-       return snd_soc_register_codec(&client->dev, &max9877_codec, NULL, 0);
-}
-
-static int max9877_i2c_remove(struct i2c_client *client)
-{
-       snd_soc_unregister_codec(&client->dev);
-
-       return 0;
+       return devm_snd_soc_register_component(&client->dev,
+                       &max9877_component_driver, NULL, 0);
 }
 
 static const struct i2c_device_id max9877_i2c_id[] = {
@@ -172,10 +165,8 @@ MODULE_DEVICE_TABLE(i2c, max9877_i2c_id);
 static struct i2c_driver max9877_i2c_driver = {
        .driver = {
                .name = "max9877",
-               .owner = THIS_MODULE,
        },
        .probe = max9877_i2c_probe,
-       .remove = max9877_i2c_remove,
        .id_table = max9877_i2c_id,
 };