summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/rcar
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2014-03-02 23:43:18 -0800
committerMark Brown <broonie@linaro.org>2014-03-04 12:13:49 +0800
commitd1ac970f5de94bef9e094b46f016899d04e8178b (patch)
tree62554bd56c8e28bf068bb622f9bffb1c5807c88b /sound/soc/sh/rcar
parent468be93eb4e28c5710ed8acc1b938937707e537c (diff)
ASoC: rsnd: use function pointer for each probe
R-Car sound consists of many devices. It will have more device support in the future. Thus, for each probe become now function pointer array. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/sh/rcar')
-rw-r--r--sound/soc/sh/rcar/core.c34
1 files changed, 14 insertions, 20 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 416b0782503..ea747614fbf 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -814,7 +814,15 @@ static int rsnd_probe(struct platform_device *pdev)
struct rcar_snd_info *info;
struct rsnd_priv *priv;
struct device *dev = &pdev->dev;
- int ret;
+ int (*probe_func[])(struct platform_device *pdev,
+ struct rsnd_priv *priv) = {
+ rsnd_gen_probe,
+ rsnd_ssi_probe,
+ rsnd_scu_probe,
+ rsnd_adg_probe,
+ rsnd_dai_probe,
+ };
+ int ret, i;
info = pdev->dev.platform_data;
if (!info) {
@@ -838,25 +846,11 @@ static int rsnd_probe(struct platform_device *pdev)
/*
* init each module
*/
- ret = rsnd_gen_probe(pdev, priv);
- if (ret)
- return ret;
-
- ret = rsnd_ssi_probe(pdev, priv);
- if (ret)
- return ret;
-
- ret = rsnd_scu_probe(pdev, priv);
- if (ret)
- return ret;
-
- ret = rsnd_adg_probe(pdev, priv);
- if (ret)
- return ret;
-
- ret = rsnd_dai_probe(pdev, priv);
- if (ret)
- return ret;
+ for (i = 0; i < ARRAY_SIZE(probe_func); i++) {
+ ret = probe_func[i](pdev, priv);
+ if (ret)
+ return ret;
+ }
/*
* asoc register