diff options
| -rw-r--r-- | sound/soc/sh/rcar/src.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index 61009c44ed90..c5ddbccd7530 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c | |||
| @@ -268,10 +268,6 @@ static int rsnd_src_stop(struct rsnd_mod *mod, | |||
| 268 | return 0; | 268 | return 0; |
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | static struct rsnd_mod_ops rsnd_src_non_ops = { | ||
| 272 | .name = "src (non)", | ||
| 273 | }; | ||
| 274 | |||
| 275 | /* | 271 | /* |
| 276 | * Gen1 functions | 272 | * Gen1 functions |
| 277 | */ | 273 | */ |
| @@ -627,6 +623,16 @@ int rsnd_src_probe(struct platform_device *pdev, | |||
| 627 | char name[RSND_SRC_NAME_SIZE]; | 623 | char name[RSND_SRC_NAME_SIZE]; |
| 628 | int i, nr; | 624 | int i, nr; |
| 629 | 625 | ||
| 626 | ops = NULL; | ||
| 627 | if (rsnd_is_gen1(priv)) | ||
| 628 | ops = &rsnd_src_gen1_ops; | ||
| 629 | if (rsnd_is_gen2(priv)) | ||
| 630 | ops = &rsnd_src_gen2_ops; | ||
| 631 | if (!ops) { | ||
| 632 | dev_err(dev, "unknown Generation\n"); | ||
| 633 | return -EIO; | ||
| 634 | } | ||
| 635 | |||
| 630 | rsnd_of_parse_src(pdev, of_data, priv); | 636 | rsnd_of_parse_src(pdev, of_data, priv); |
| 631 | 637 | ||
| 632 | /* | 638 | /* |
| @@ -655,12 +661,6 @@ int rsnd_src_probe(struct platform_device *pdev, | |||
| 655 | src->info = &info->src_info[i]; | 661 | src->info = &info->src_info[i]; |
| 656 | src->clk = clk; | 662 | src->clk = clk; |
| 657 | 663 | ||
| 658 | ops = &rsnd_src_non_ops; | ||
| 659 | if (rsnd_is_gen1(priv)) | ||
| 660 | ops = &rsnd_src_gen1_ops; | ||
| 661 | if (rsnd_is_gen2(priv)) | ||
| 662 | ops = &rsnd_src_gen2_ops; | ||
| 663 | |||
| 664 | rsnd_mod_init(priv, &src->mod, ops, RSND_MOD_SRC, i); | 664 | rsnd_mod_init(priv, &src->mod, ops, RSND_MOD_SRC, i); |
| 665 | 665 | ||
| 666 | dev_dbg(dev, "SRC%d probed\n", i); | 666 | dev_dbg(dev, "SRC%d probed\n", i); |
