From 9124103324ba0671346c43304780b6292e754ab9 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Mon, 10 Sep 2012 13:46:29 +0300 Subject: [PATCH] --- yaml --- r: 332149 b: refs/heads/master c: d0b3847b40f8da4b90b22db0f3678ba68bcd1b4e h: refs/heads/master i: 332147: ade9b7f8a47edf0abbce9b53e9855553e0e66f40 v: v3 --- [refs] | 2 +- trunk/include/linux/i2c/twl.h | 2 -- trunk/sound/soc/codecs/twl4030.c | 6 ------ 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index bea6d92e6c64..6e88957b5b90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb775d38e0ff4a83d7fd020a7b147bb61b1e4006 +refs/heads/master: d0b3847b40f8da4b90b22db0f3678ba68bcd1b4e diff --git a/trunk/include/linux/i2c/twl.h b/trunk/include/linux/i2c/twl.h index 2040309a46b7..a4885a6cd10d 100644 --- a/trunk/include/linux/i2c/twl.h +++ b/trunk/include/linux/i2c/twl.h @@ -667,8 +667,6 @@ struct twl4030_codec_data { unsigned int check_defaults:1; unsigned int reset_registers:1; unsigned int hs_extmute:1; - void (*set_hs_extmute)(int mute); /* Deprecated, use hs_extmute_gpio and - hs_extmute_disable_level */ int hs_extmute_gpio; }; diff --git a/trunk/sound/soc/codecs/twl4030.c b/trunk/sound/soc/codecs/twl4030.c index 0c83c9263f4f..aa96788c8673 100644 --- a/trunk/sound/soc/codecs/twl4030.c +++ b/trunk/sound/soc/codecs/twl4030.c @@ -767,9 +767,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp) if (pdata && pdata->hs_extmute) { if (gpio_is_valid(pdata->hs_extmute_gpio)) { gpio_set_value(pdata->hs_extmute_gpio, 1); - } else if (pdata->set_hs_extmute) { - dev_warn(codec->dev, "set_hs_extmute is deprecated\n"); - pdata->set_hs_extmute(1); } else { hs_pop |= TWL4030_EXTMUTE; twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop); @@ -808,9 +805,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp) if (pdata && pdata->hs_extmute) { if (gpio_is_valid(pdata->hs_extmute_gpio)) { gpio_set_value(pdata->hs_extmute_gpio, 0); - } else if (pdata->set_hs_extmute) { - dev_warn(codec->dev, "set_hs_extmute is deprecated\n"); - pdata->set_hs_extmute(0); } else { hs_pop &= ~TWL4030_EXTMUTE; twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop);