Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a8062e421f8a5800c83b85ab10c4cefd8409844f

Authored by Linus Torvalds
2 parents 1fd2a850ec b5c49d49b9
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Merge branch 'fix/asoc' of git://github.com/tiwai/sound 

* 'fix/asoc' of git://github.com/tiwai/sound:
  ASoC: omap_mcpdm_remove cannot be __devexit
  ASoC: Fix setting update bits for WM8753_LADC and WM8753_RADC
  ASoC: use a valid device for dev_err() in Zylonite

Showing 4 changed files Side-by-side Diff

sound/soc/codecs/wm8753.c
Diff comments   View file @ a8062e4
... ... @@ -1454,8 +1454,8 @@
1454 1454 /* set the update bits */
1455 1455 snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100);
1456 1456 snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100);
1457   - snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100);
1458   - snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100);
  1457 + snd_soc_update_bits(codec, WM8753_LADC, 0x0100, 0x0100);
  1458 + snd_soc_update_bits(codec, WM8753_RADC, 0x0100, 0x0100);
1459 1459 snd_soc_update_bits(codec, WM8753_LOUT1V, 0x0100, 0x0100);
1460 1460 snd_soc_update_bits(codec, WM8753_ROUT1V, 0x0100, 0x0100);
1461 1461 snd_soc_update_bits(codec, WM8753_LOUT2V, 0x0100, 0x0100);
sound/soc/omap/mcpdm.c
Diff comments   View file @ a8062e4
... ... @@ -449,7 +449,7 @@
449 449 return ret;
450 450 }
451 451  
452   -int __devexit omap_mcpdm_remove(struct platform_device *pdev)
  452 +int omap_mcpdm_remove(struct platform_device *pdev)
453 453 {
454 454 struct omap_mcpdm *mcpdm_ptr = platform_get_drvdata(pdev);
455 455  
sound/soc/omap/mcpdm.h
Diff comments   View file @ a8062e4
... ... @@ -150,5 +150,5 @@
150 150 extern void omap_mcpdm_free(void);
151 151 extern int omap_mcpdm_set_offset(int offset1, int offset2);
152 152 int __devinit omap_mcpdm_probe(struct platform_device *pdev);
153   -int __devexit omap_mcpdm_remove(struct platform_device *pdev);
  153 +int omap_mcpdm_remove(struct platform_device *pdev);
sound/soc/pxa/zylonite.c
Diff comments   View file @ a8062e4
... ... @@ -196,20 +196,20 @@
196 196 if (clk_pout) {
197 197 pout = clk_get(NULL, "CLK_POUT");
198 198 if (IS_ERR(pout)) {
199   - dev_err(&pdev->dev, "Unable to obtain CLK_POUT: %ld\n",
  199 + dev_err(card->dev, "Unable to obtain CLK_POUT: %ld\n",
200 200 PTR_ERR(pout));
201 201 return PTR_ERR(pout);
202 202 }
203 203  
204 204 ret = clk_enable(pout);
205 205 if (ret != 0) {
206   - dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n",
  206 + dev_err(card->dev, "Unable to enable CLK_POUT: %d\n",
207 207 ret);
208 208 clk_put(pout);
209 209 return ret;
210 210 }
211 211  
212   - dev_dbg(&pdev->dev, "MCLK enabled at %luHz\n",
  212 + dev_dbg(card->dev, "MCLK enabled at %luHz\n",
213 213 clk_get_rate(pout));
214 214 }
215 215  
... ... @@ -241,7 +241,7 @@
241 241 if (clk_pout) {
242 242 ret = clk_enable(pout);
243 243 if (ret != 0)
244   - dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n",
  244 + dev_err(card->dev, "Unable to enable CLK_POUT: %d\n",
245 245 ret);
246 246 }
247 247