i2c: Make remove callback return void

[sfrench/cifs-2.6.git] / sound / soc / codecs / tas6424.c

diff --git a/sound/soc/codecs/tas6424.c b/sound/soc/codecs/tas6424.c
index 22b53856e6918d9403d5573d064071e97cfb4749..f8ff69fa2549c9f3de436c18dde73fca9514b27e 100644 (file)
--- a/sound/soc/codecs/tas6424.c
+++ b/sound/soc/codecs/tas6424.c
@@ -160,11 +160,11 @@ static int tas6424_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
        dev_dbg(component->dev, "%s() fmt=0x%0x\n", __func__, fmt);
 
        /* clock masters */
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBS_CFS:
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBC_CFC:
                break;
        default:
-               dev_err(component->dev, "Invalid DAI master/slave interface\n");
+               dev_err(component->dev, "Invalid DAI clocking\n");
                return -EINVAL;
        }
 
@@ -375,7 +375,6 @@ static struct snd_soc_component_driver soc_codec_dev_tas6424 = {
        .num_dapm_routes        = ARRAY_SIZE(tas6424_audio_map),
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct snd_soc_dai_ops tas6424_speaker_dai_ops = {
@@ -775,7 +774,7 @@ disable_regs:
        return ret;
 }
 
-static int tas6424_i2c_remove(struct i2c_client *client)
+static void tas6424_i2c_remove(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct tas6424_data *tas6424 = dev_get_drvdata(dev);
@@ -791,8 +790,6 @@ static int tas6424_i2c_remove(struct i2c_client *client)
                                     tas6424->supplies);
        if (ret < 0)
                dev_err(dev, "unable to disable supplies: %d\n", ret);
-
-       return 0;
 }
 
 static const struct i2c_device_id tas6424_i2c_ids[] = {