ASoC: rename functions that pollute the simple_xxx namespace
include/linux/fs.h defines a bunch of simple fs helpers, (e.g. simple_rename) and we intend to add an fs helper named simple_remove. Rename the ASoC driver static functions, so they will not collide with the upcoming fs helper function name. Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Cc: Mark Brown <broonie@kernel.org> Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
1c7c3237c0
commit
b0a821daf0
@ -607,7 +607,7 @@ static int simple_soc_probe(struct snd_soc_card *card)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int simple_probe(struct platform_device *pdev)
|
||||
static int asoc_simple_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct asoc_simple_priv *priv;
|
||||
struct device *dev = &pdev->dev;
|
||||
@ -705,7 +705,7 @@ err:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int simple_remove(struct platform_device *pdev)
|
||||
static int asoc_simple_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
|
||||
@ -726,8 +726,8 @@ static struct platform_driver asoc_simple_card = {
|
||||
.pm = &snd_soc_pm_ops,
|
||||
.of_match_table = simple_of_match,
|
||||
},
|
||||
.probe = simple_probe,
|
||||
.remove = simple_remove,
|
||||
.probe = asoc_simple_probe,
|
||||
.remove = asoc_simple_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(asoc_simple_card);
|
||||
|
Loading…
x
Reference in New Issue
Block a user