asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: rcar: remove rcar_gen_ops

Browse source 
Current rcar driver gen.c is using rcar_gen_ops
which was made with the assumption that
Gen1 and Gen2 need different behavior.
but it was not needed.
This patch removes unnecessary complex method.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Kuninori Morimoto 2013-11-28 18:43:34 -08:00 committed by Mark Brown
parent 994a9df1e3
commit 531eaf491e
1 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
sound/soc/sh/rcar/gen.c
View file

@ -10,14 +10,6 @@
*/
#include "rsnd.h"
struct rsnd_gen_ops {
int (*probe)(struct platform_device *pdev,
struct rcar_snd_info *info,
struct rsnd_priv *priv);
void (*remove)(struct platform_device *pdev,
struct rsnd_priv *priv);
};
struct rsnd_gen {
void __iomem *base[RSND_BASE_MAX];
@ -307,16 +299,6 @@ static int rsnd_gen1_probe(struct platform_device *pdev,
}
static void rsnd_gen1_remove(struct platform_device *pdev,
struct rsnd_priv *priv)
{
}
static struct rsnd_gen_ops rsnd_gen1_ops = {
.probe = rsnd_gen1_probe,
.remove = rsnd_gen1_remove,
};
/*
* Gen
*/
@ -326,6 +308,7 @@ int rsnd_gen_probe(struct platform_device *pdev,
{
struct device *dev = rsnd_priv_to_dev(priv);
struct rsnd_gen *gen;
int ret;
gen = devm_kzalloc(dev, sizeof(*gen), GFP_KERNEL);
if (!gen) {
@ -333,23 +316,19 @@ int rsnd_gen_probe(struct platform_device *pdev,
return -ENOMEM;
}
if (rsnd_is_gen1(priv))
gen->ops = &rsnd_gen1_ops;
priv->gen = gen;
if (!gen->ops) {
if (rsnd_is_gen1(priv)) {
ret = rsnd_gen1_probe(pdev, info, priv);
} else {
dev_err(dev, "unknown generation R-Car sound device\n");
return -ENODEV;
}
priv->gen = gen;
return gen->ops->probe(pdev, info, priv);
return ret;
}
void rsnd_gen_remove(struct platform_device *pdev,
struct rsnd_priv *priv)
{
struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
gen->ops->remove(pdev, priv);
}