diff options
-rw-r--r-- | sound/soc/codecs/twl6040.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 984911ba5807..9b9a6e587610 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c | |||
@@ -69,10 +69,6 @@ struct twl6040_data { | |||
69 | int hs_power_mode_locked; | 69 | int hs_power_mode_locked; |
70 | unsigned int clk_in; | 70 | unsigned int clk_in; |
71 | unsigned int sysclk; | 71 | unsigned int sysclk; |
72 | u16 hs_left_step; | ||
73 | u16 hs_right_step; | ||
74 | u16 hf_left_step; | ||
75 | u16 hf_right_step; | ||
76 | struct twl6040_jack_data hs_jack; | 72 | struct twl6040_jack_data hs_jack; |
77 | struct snd_soc_codec *codec; | 73 | struct snd_soc_codec *codec; |
78 | struct mutex mutex; | 74 | struct mutex mutex; |
@@ -1124,7 +1120,6 @@ static int twl6040_resume(struct snd_soc_codec *codec) | |||
1124 | static int twl6040_probe(struct snd_soc_codec *codec) | 1120 | static int twl6040_probe(struct snd_soc_codec *codec) |
1125 | { | 1121 | { |
1126 | struct twl6040_data *priv; | 1122 | struct twl6040_data *priv; |
1127 | struct twl6040_codec_data *pdata = dev_get_platdata(codec->dev); | ||
1128 | struct platform_device *pdev = container_of(codec->dev, | 1123 | struct platform_device *pdev = container_of(codec->dev, |
1129 | struct platform_device, dev); | 1124 | struct platform_device, dev); |
1130 | int ret = 0; | 1125 | int ret = 0; |
@@ -1138,22 +1133,6 @@ static int twl6040_probe(struct snd_soc_codec *codec) | |||
1138 | priv->codec = codec; | 1133 | priv->codec = codec; |
1139 | codec->control_data = dev_get_drvdata(codec->dev->parent); | 1134 | codec->control_data = dev_get_drvdata(codec->dev->parent); |
1140 | 1135 | ||
1141 | if (pdata && pdata->hs_left_step && pdata->hs_right_step) { | ||
1142 | priv->hs_left_step = pdata->hs_left_step; | ||
1143 | priv->hs_right_step = pdata->hs_right_step; | ||
1144 | } else { | ||
1145 | priv->hs_left_step = 1; | ||
1146 | priv->hs_right_step = 1; | ||
1147 | } | ||
1148 | |||
1149 | if (pdata && pdata->hf_left_step && pdata->hf_right_step) { | ||
1150 | priv->hf_left_step = pdata->hf_left_step; | ||
1151 | priv->hf_right_step = pdata->hf_right_step; | ||
1152 | } else { | ||
1153 | priv->hf_left_step = 1; | ||
1154 | priv->hf_right_step = 1; | ||
1155 | } | ||
1156 | |||
1157 | priv->plug_irq = platform_get_irq(pdev, 0); | 1136 | priv->plug_irq = platform_get_irq(pdev, 0); |
1158 | if (priv->plug_irq < 0) { | 1137 | if (priv->plug_irq < 0) { |
1159 | dev_err(codec->dev, "invalid irq\n"); | 1138 | dev_err(codec->dev, "invalid irq\n"); |