aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/pcm1789-i2c.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/pcm1789-i2c.c')
-rw-r--r--sound/soc/codecs/pcm1789-i2c.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/codecs/pcm1789-i2c.c b/sound/soc/codecs/pcm1789-i2c.c
index 7a6be45f8149..fafe0dcbe4ea 100644
--- a/sound/soc/codecs/pcm1789-i2c.c
+++ b/sound/soc/codecs/pcm1789-i2c.c
@@ -12,8 +12,7 @@
#include "pcm1789.h"
-static int pcm1789_i2c_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int pcm1789_i2c_probe(struct i2c_client *client)
{
struct regmap *regmap;
int ret;
@@ -28,9 +27,9 @@ static int pcm1789_i2c_probe(struct i2c_client *client,
return pcm1789_common_init(&client->dev, regmap);
}
-static int pcm1789_i2c_remove(struct i2c_client *client)
+static void pcm1789_i2c_remove(struct i2c_client *client)
{
- return pcm1789_common_exit(&client->dev);
+ pcm1789_common_exit(&client->dev);
}
#ifdef CONFIG_OF
@@ -53,7 +52,7 @@ static struct i2c_driver pcm1789_i2c_driver = {
.of_match_table = of_match_ptr(pcm1789_of_match),
},
.id_table = pcm1789_i2c_ids,
- .probe = pcm1789_i2c_probe,
+ .probe_new = pcm1789_i2c_probe,
.remove = pcm1789_i2c_remove,
};