aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/rcar/gen.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/sh/rcar/gen.c')
-rw-r--r--sound/soc/sh/rcar/gen.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index 0a43b906ffdf..bcb98f4be831 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -276,7 +276,6 @@ static int rsnd_gen2_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen)
276} 276}
277 277
278static int rsnd_gen2_probe(struct platform_device *pdev, 278static int rsnd_gen2_probe(struct platform_device *pdev,
279 struct rcar_snd_info *info,
280 struct rsnd_priv *priv) 279 struct rsnd_priv *priv)
281{ 280{
282 struct device *dev = rsnd_priv_to_dev(priv); 281 struct device *dev = rsnd_priv_to_dev(priv);
@@ -374,7 +373,6 @@ static int rsnd_gen1_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen)
374} 373}
375 374
376static int rsnd_gen1_probe(struct platform_device *pdev, 375static int rsnd_gen1_probe(struct platform_device *pdev,
377 struct rcar_snd_info *info,
378 struct rsnd_priv *priv) 376 struct rsnd_priv *priv)
379{ 377{
380 struct device *dev = rsnd_priv_to_dev(priv); 378 struct device *dev = rsnd_priv_to_dev(priv);
@@ -419,7 +417,6 @@ static int rsnd_gen1_probe(struct platform_device *pdev,
419 * Gen 417 * Gen
420 */ 418 */
421int rsnd_gen_probe(struct platform_device *pdev, 419int rsnd_gen_probe(struct platform_device *pdev,
422 struct rcar_snd_info *info,
423 struct rsnd_priv *priv) 420 struct rsnd_priv *priv)
424{ 421{
425 struct device *dev = rsnd_priv_to_dev(priv); 422 struct device *dev = rsnd_priv_to_dev(priv);
@@ -436,9 +433,9 @@ int rsnd_gen_probe(struct platform_device *pdev,
436 433
437 ret = -ENODEV; 434 ret = -ENODEV;
438 if (rsnd_is_gen1(priv)) 435 if (rsnd_is_gen1(priv))
439 ret = rsnd_gen1_probe(pdev, info, priv); 436 ret = rsnd_gen1_probe(pdev, priv);
440 else if (rsnd_is_gen2(priv)) 437 else if (rsnd_is_gen2(priv))
441 ret = rsnd_gen2_probe(pdev, info, priv); 438 ret = rsnd_gen2_probe(pdev, priv);
442 439
443 if (ret < 0) 440 if (ret < 0)
444 dev_err(dev, "unknown generation R-Car sound device\n"); 441 dev_err(dev, "unknown generation R-Car sound device\n");