aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-abe-twl6040.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/omap/omap-abe-twl6040.c')
-rw-r--r--sound/soc/omap/omap-abe-twl6040.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index a57a4e68dcc6..e7d93fa412a9 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -273,7 +273,7 @@ static struct snd_soc_card omap_abe_card = {
273 .num_dapm_routes = ARRAY_SIZE(audio_map), 273 .num_dapm_routes = ARRAY_SIZE(audio_map),
274}; 274};
275 275
276static __devinit int omap_abe_probe(struct platform_device *pdev) 276static int omap_abe_probe(struct platform_device *pdev)
277{ 277{
278 struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev); 278 struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev);
279 struct device_node *node = pdev->dev.of_node; 279 struct device_node *node = pdev->dev.of_node;
@@ -331,8 +331,8 @@ static __devinit int omap_abe_probe(struct platform_device *pdev)
331 num_links = 1; 331 num_links = 1;
332 } 332 }
333 333
334 of_property_read_u32(node, "ti,jack-detection", 334 priv->jack_detection = of_property_read_bool(node,
335 &priv->jack_detection); 335 "ti,jack-detection");
336 of_property_read_u32(node, "ti,mclk-freq", 336 of_property_read_u32(node, "ti,mclk-freq",
337 &priv->mclk_freq); 337 &priv->mclk_freq);
338 if (!priv->mclk_freq) { 338 if (!priv->mclk_freq) {
@@ -390,7 +390,7 @@ err_unregister:
390 return ret; 390 return ret;
391} 391}
392 392
393static int __devexit omap_abe_remove(struct platform_device *pdev) 393static int omap_abe_remove(struct platform_device *pdev)
394{ 394{
395 struct snd_soc_card *card = platform_get_drvdata(pdev); 395 struct snd_soc_card *card = platform_get_drvdata(pdev);
396 struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card); 396 struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);
@@ -417,7 +417,7 @@ static struct platform_driver omap_abe_driver = {
417 .of_match_table = omap_abe_of_match, 417 .of_match_table = omap_abe_of_match,
418 }, 418 },
419 .probe = omap_abe_probe, 419 .probe = omap_abe_probe,
420 .remove = __devexit_p(omap_abe_remove), 420 .remove = omap_abe_remove,
421}; 421};
422 422
423module_platform_driver(omap_abe_driver); 423module_platform_driver(omap_abe_driver);