aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/tegra/tegra_alc5632.c1
-rw-r--r--sound/soc/tegra/tegra_max98090.c1
-rw-r--r--sound/soc/tegra/tegra_rt5640.c1
-rw-r--r--sound/soc/tegra/tegra_rt5677.c1
-rw-r--r--sound/soc/tegra/tegra_sgtl5000.c1
-rw-r--r--sound/soc/tegra/tegra_wm8753.c1
-rw-r--r--sound/soc/tegra/tegra_wm8903.c1
-rw-r--r--sound/soc/tegra/tegra_wm9712.c1
-rw-r--r--sound/soc/tegra/trimslice.c1
9 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c
index 0509902512cc..053fe4c5ed4c 100644
--- a/sound/soc/tegra/tegra_alc5632.c
+++ b/sound/soc/tegra/tegra_alc5632.c
@@ -173,7 +173,6 @@ static int tegra_alc5632_probe(struct platform_device *pdev)
173 return -ENOMEM; 173 return -ENOMEM;
174 174
175 card->dev = &pdev->dev; 175 card->dev = &pdev->dev;
176 platform_set_drvdata(pdev, card);
177 snd_soc_card_set_drvdata(card, alc5632); 176 snd_soc_card_set_drvdata(card, alc5632);
178 177
179 alc5632->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0); 178 alc5632->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0);
diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c
index c34a54d6e812..41feee9beb12 100644
--- a/sound/soc/tegra/tegra_max98090.c
+++ b/sound/soc/tegra/tegra_max98090.c
@@ -229,7 +229,6 @@ static int tegra_max98090_probe(struct platform_device *pdev)
229 return -ENOMEM; 229 return -ENOMEM;
230 230
231 card->dev = &pdev->dev; 231 card->dev = &pdev->dev;
232 platform_set_drvdata(pdev, card);
233 snd_soc_card_set_drvdata(card, machine); 232 snd_soc_card_set_drvdata(card, machine);
234 233
235 machine->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0); 234 machine->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0);
diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c
index 93a356802345..02f27fe14324 100644
--- a/sound/soc/tegra/tegra_rt5640.c
+++ b/sound/soc/tegra/tegra_rt5640.c
@@ -174,7 +174,6 @@ static int tegra_rt5640_probe(struct platform_device *pdev)
174 return -ENOMEM; 174 return -ENOMEM;
175 175
176 card->dev = &pdev->dev; 176 card->dev = &pdev->dev;
177 platform_set_drvdata(pdev, card);
178 snd_soc_card_set_drvdata(card, machine); 177 snd_soc_card_set_drvdata(card, machine);
179 178
180 machine->gpio_hp_det = of_get_named_gpio_flags( 179 machine->gpio_hp_det = of_get_named_gpio_flags(
diff --git a/sound/soc/tegra/tegra_rt5677.c b/sound/soc/tegra/tegra_rt5677.c
index ebf58d0e0f10..3dbf0e1350c1 100644
--- a/sound/soc/tegra/tegra_rt5677.c
+++ b/sound/soc/tegra/tegra_rt5677.c
@@ -222,7 +222,6 @@ static int tegra_rt5677_probe(struct platform_device *pdev)
222 return -ENOMEM; 222 return -ENOMEM;
223 223
224 card->dev = &pdev->dev; 224 card->dev = &pdev->dev;
225 platform_set_drvdata(pdev, card);
226 snd_soc_card_set_drvdata(card, machine); 225 snd_soc_card_set_drvdata(card, machine);
227 226
228 machine->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0); 227 machine->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0);
diff --git a/sound/soc/tegra/tegra_sgtl5000.c b/sound/soc/tegra/tegra_sgtl5000.c
index 6dda01f69983..45a4aa9d2a47 100644
--- a/sound/soc/tegra/tegra_sgtl5000.c
+++ b/sound/soc/tegra/tegra_sgtl5000.c
@@ -124,7 +124,6 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev)
124 return -ENOMEM; 124 return -ENOMEM;
125 125
126 card->dev = &pdev->dev; 126 card->dev = &pdev->dev;
127 platform_set_drvdata(pdev, card);
128 snd_soc_card_set_drvdata(card, machine); 127 snd_soc_card_set_drvdata(card, machine);
129 128
130 ret = snd_soc_of_parse_card_name(card, "nvidia,model"); 129 ret = snd_soc_of_parse_card_name(card, "nvidia,model");
diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c
index d0ab0026a4cd..23a810e3bacc 100644
--- a/sound/soc/tegra/tegra_wm8753.c
+++ b/sound/soc/tegra/tegra_wm8753.c
@@ -132,7 +132,6 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev)
132 return -ENOMEM; 132 return -ENOMEM;
133 133
134 card->dev = &pdev->dev; 134 card->dev = &pdev->dev;
135 platform_set_drvdata(pdev, card);
136 snd_soc_card_set_drvdata(card, machine); 135 snd_soc_card_set_drvdata(card, machine);
137 136
138 ret = snd_soc_of_parse_card_name(card, "nvidia,model"); 137 ret = snd_soc_of_parse_card_name(card, "nvidia,model");
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index dbfb49298ae8..d4a4a2be8b42 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -252,7 +252,6 @@ static int tegra_wm8903_driver_probe(struct platform_device *pdev)
252 return -ENOMEM; 252 return -ENOMEM;
253 253
254 card->dev = &pdev->dev; 254 card->dev = &pdev->dev;
255 platform_set_drvdata(pdev, card);
256 snd_soc_card_set_drvdata(card, machine); 255 snd_soc_card_set_drvdata(card, machine);
257 256
258 machine->gpio_spkr_en = of_get_named_gpio(np, "nvidia,spkr-en-gpios", 257 machine->gpio_spkr_en = of_get_named_gpio(np, "nvidia,spkr-en-gpios",
diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c
index c9cd22432627..864a3345972e 100644
--- a/sound/soc/tegra/tegra_wm9712.c
+++ b/sound/soc/tegra/tegra_wm9712.c
@@ -81,7 +81,6 @@ static int tegra_wm9712_driver_probe(struct platform_device *pdev)
81 return -ENOMEM; 81 return -ENOMEM;
82 82
83 card->dev = &pdev->dev; 83 card->dev = &pdev->dev;
84 platform_set_drvdata(pdev, card);
85 snd_soc_card_set_drvdata(card, machine); 84 snd_soc_card_set_drvdata(card, machine);
86 85
87 machine->codec = platform_device_alloc("wm9712-codec", -1); 86 machine->codec = platform_device_alloc("wm9712-codec", -1);
diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c
index c9dcad9bb931..99bcdd979eb2 100644
--- a/sound/soc/tegra/trimslice.c
+++ b/sound/soc/tegra/trimslice.c
@@ -127,7 +127,6 @@ static int tegra_snd_trimslice_probe(struct platform_device *pdev)
127 return -ENOMEM; 127 return -ENOMEM;
128 128
129 card->dev = &pdev->dev; 129 card->dev = &pdev->dev;
130 platform_set_drvdata(pdev, card);
131 snd_soc_card_set_drvdata(card, trimslice); 130 snd_soc_card_set_drvdata(card, trimslice);
132 131
133 trimslice_tlv320aic23_dai.codec_of_node = of_parse_phandle(np, 132 trimslice_tlv320aic23_dai.codec_of_node = of_parse_phandle(np,