Skip to content

Commit

Permalink
ASoC: samsung: Use devm_snd_soc_register_card
Browse files Browse the repository at this point in the history 
Replace snd_soc_register_card with devm_snd_soc_register_card.
With this change, we can delete the empty remove functions.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Tushar Behera authored and Mark Brown committed May 21, 2014
1 parent fbfad49 commit c583883
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 97 deletions.
16 changes: 3 additions & 13 deletions sound/soc/samsung/bells.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,22 +433,13 @@ static int bells_probe(struct platform_device *pdev)

bells_cards[pdev->id].dev = &pdev->dev;

ret = snd_soc_register_card(&bells_cards[pdev->id]);
if (ret) {
ret = devm_snd_soc_register_card(&pdev->dev, &bells_cards[pdev->id]);
if (ret)
dev_err(&pdev->dev,
"snd_soc_register_card(%s) failed: %d\n",
bells_cards[pdev->id].name, ret);
return ret;
}

return 0;
}

static int bells_remove(struct platform_device *pdev)
{
snd_soc_unregister_card(&bells_cards[pdev->id]);

return 0;
return ret;
}

static struct platform_driver bells_driver = {
Expand All @@ -458,7 +449,6 @@ static struct platform_driver bells_driver = {
.pm = &snd_soc_pm_ops,
},
.probe = bells_probe,
.remove = bells_remove,
};

module_platform_driver(bells_driver);
Expand Down
18 changes: 3 additions & 15 deletions sound/soc/samsung/littlemill.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,23 +304,12 @@ static int littlemill_probe(struct platform_device *pdev)

card->dev = &pdev->dev;

ret = snd_soc_register_card(card);
if (ret) {
ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
return ret;
}

return 0;
}

static int littlemill_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);

snd_soc_unregister_card(card);

return 0;
return ret;
}

static struct platform_driver littlemill_driver = {
Expand All @@ -330,7 +319,6 @@ static struct platform_driver littlemill_driver = {
.pm = &snd_soc_pm_ops,
},
.probe = littlemill_probe,
.remove = littlemill_remove,
};

module_platform_driver(littlemill_driver);
Expand Down
18 changes: 3 additions & 15 deletions sound/soc/samsung/lowland.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,23 +187,12 @@ static int lowland_probe(struct platform_device *pdev)

card->dev = &pdev->dev;

ret = snd_soc_register_card(card);
if (ret) {
ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
return ret;
}

return 0;
}

static int lowland_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);

snd_soc_unregister_card(card);

return 0;
return ret;
}

static struct platform_driver lowland_driver = {
Expand All @@ -213,7 +202,6 @@ static struct platform_driver lowland_driver = {
.pm = &snd_soc_pm_ops,
},
.probe = lowland_probe,
.remove = lowland_remove,
};

module_platform_driver(lowland_driver);
Expand Down
15 changes: 3 additions & 12 deletions sound/soc/samsung/smdk_wm8580pcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,19 +164,11 @@ static int snd_smdk_probe(struct platform_device *pdev)
xtal_freq = mclk_freq = SMDK_WM8580_EXT_VOICE;

smdk_pcm.dev = &pdev->dev;
ret = snd_soc_register_card(&smdk_pcm);
if (ret) {
ret = devm_snd_soc_register_card(&pdev->dev, &smdk_pcm);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret);
return ret;
}

return 0;
}

static int snd_smdk_remove(struct platform_device *pdev)
{
snd_soc_unregister_card(&smdk_pcm);
return 0;
return ret;
}

static struct platform_driver snd_smdk_driver = {
Expand All @@ -185,7 +177,6 @@ static struct platform_driver snd_smdk_driver = {
.name = "samsung-smdk-pcm",
},
.probe = snd_smdk_probe,
.remove = snd_smdk_remove,
};

module_platform_driver(snd_smdk_driver);
Expand Down
15 changes: 3 additions & 12 deletions sound/soc/samsung/smdk_wm8994pcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,19 +134,11 @@ static int snd_smdk_probe(struct platform_device *pdev)
int ret = 0;

smdk_pcm.dev = &pdev->dev;
ret = snd_soc_register_card(&smdk_pcm);
if (ret) {
ret = devm_snd_soc_register_card(&pdev->dev, &smdk_pcm);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret);
return ret;
}

return 0;
}

static int snd_smdk_remove(struct platform_device *pdev)
{
snd_soc_unregister_card(&smdk_pcm);
return 0;
return ret;
}

static struct platform_driver snd_smdk_driver = {
Expand All @@ -155,7 +147,6 @@ static struct platform_driver snd_smdk_driver = {
.name = "samsung-smdk-pcm",
},
.probe = snd_smdk_probe,
.remove = snd_smdk_remove,
};

module_platform_driver(snd_smdk_driver);
Expand Down
18 changes: 3 additions & 15 deletions sound/soc/samsung/speyside.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,23 +327,12 @@ static int speyside_probe(struct platform_device *pdev)

card->dev = &pdev->dev;

ret = snd_soc_register_card(card);
if (ret) {
ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
return ret;
}

return 0;
}

static int speyside_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);

snd_soc_unregister_card(card);

return 0;
return ret;
}

static struct platform_driver speyside_driver = {
Expand All @@ -353,7 +342,6 @@ static struct platform_driver speyside_driver = {
.pm = &snd_soc_pm_ops,
},
.probe = speyside_probe,
.remove = speyside_remove,
};

module_platform_driver(speyside_driver);
Expand Down
18 changes: 3 additions & 15 deletions sound/soc/samsung/tobermory.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,23 +223,12 @@ static int tobermory_probe(struct platform_device *pdev)

card->dev = &pdev->dev;

ret = snd_soc_register_card(card);
if (ret) {
ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
return ret;
}

return 0;
}

static int tobermory_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);

snd_soc_unregister_card(card);

return 0;
return ret;
}

static struct platform_driver tobermory_driver = {
Expand All @@ -249,7 +238,6 @@ static struct platform_driver tobermory_driver = {
.pm = &snd_soc_pm_ops,
},
.probe = tobermory_probe,
.remove = tobermory_remove,
};

module_platform_driver(tobermory_driver);
Expand Down

0 comments on commit c583883

Please sign in to comment.