From: Amir Goldstein Date: Thu, 16 May 2019 10:26:28 +0000 (+0300) Subject: ASoC: rename functions that pollute the simple_xxx namespace X-Git-Tag: v5.3-rc4~29^2~7^2~459 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b0a821daf0d04e5a8ae99829e24f2fe538f25763;p=linux.git 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 Cc: Mark Brown Signed-off-by: Amir Goldstein Signed-off-by: Mark Brown --- diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 9b568f578bcd..d16e894fce2b 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -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 @@ static int simple_probe(struct platform_device *pdev) 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);