diff options
Diffstat (limited to 'sound/soc/sh/rcar/ssi.c')
-rw-r--r-- | sound/soc/sh/rcar/ssi.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index ea8d4e7a7986..2d94a62a6577 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c | |||
@@ -57,6 +57,8 @@ | |||
57 | */ | 57 | */ |
58 | #define CONT (1 << 8) /* WS Continue Function */ | 58 | #define CONT (1 << 8) /* WS Continue Function */ |
59 | 59 | ||
60 | #define SSI_NAME "ssi" | ||
61 | |||
60 | struct rsnd_ssi { | 62 | struct rsnd_ssi { |
61 | struct clk *clk; | 63 | struct clk *clk; |
62 | struct rsnd_ssi_platform_info *info; /* rcar_snd.h */ | 64 | struct rsnd_ssi_platform_info *info; /* rcar_snd.h */ |
@@ -373,6 +375,8 @@ static int rsnd_ssi_pio_probe(struct rsnd_mod *mod, | |||
373 | if (ret) | 375 | if (ret) |
374 | dev_err(dev, "SSI request interrupt failed\n"); | 376 | dev_err(dev, "SSI request interrupt failed\n"); |
375 | 377 | ||
378 | dev_dbg(dev, "%s (PIO) is probed\n", rsnd_mod_name(mod)); | ||
379 | |||
376 | return ret; | 380 | return ret; |
377 | } | 381 | } |
378 | 382 | ||
@@ -405,7 +409,7 @@ static int rsnd_ssi_pio_stop(struct rsnd_mod *mod, | |||
405 | } | 409 | } |
406 | 410 | ||
407 | static struct rsnd_mod_ops rsnd_ssi_pio_ops = { | 411 | static struct rsnd_mod_ops rsnd_ssi_pio_ops = { |
408 | .name = "ssi (pio)", | 412 | .name = SSI_NAME, |
409 | .probe = rsnd_ssi_pio_probe, | 413 | .probe = rsnd_ssi_pio_probe, |
410 | .init = rsnd_ssi_init, | 414 | .init = rsnd_ssi_init, |
411 | .quit = rsnd_ssi_quit, | 415 | .quit = rsnd_ssi_quit, |
@@ -430,6 +434,8 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, | |||
430 | if (ret < 0) | 434 | if (ret < 0) |
431 | dev_err(dev, "SSI DMA failed\n"); | 435 | dev_err(dev, "SSI DMA failed\n"); |
432 | 436 | ||
437 | dev_dbg(dev, "%s (DMA) is probed\n", rsnd_mod_name(mod)); | ||
438 | |||
433 | return ret; | 439 | return ret; |
434 | } | 440 | } |
435 | 441 | ||
@@ -480,7 +486,7 @@ static int rsnd_ssi_dma_stop(struct rsnd_mod *mod, | |||
480 | } | 486 | } |
481 | 487 | ||
482 | static struct rsnd_mod_ops rsnd_ssi_dma_ops = { | 488 | static struct rsnd_mod_ops rsnd_ssi_dma_ops = { |
483 | .name = "ssi (dma)", | 489 | .name = SSI_NAME, |
484 | .probe = rsnd_ssi_dma_probe, | 490 | .probe = rsnd_ssi_dma_probe, |
485 | .remove = rsnd_ssi_dma_remove, | 491 | .remove = rsnd_ssi_dma_remove, |
486 | .init = rsnd_ssi_init, | 492 | .init = rsnd_ssi_init, |
@@ -493,7 +499,7 @@ static struct rsnd_mod_ops rsnd_ssi_dma_ops = { | |||
493 | * Non SSI | 499 | * Non SSI |
494 | */ | 500 | */ |
495 | static struct rsnd_mod_ops rsnd_ssi_non_ops = { | 501 | static struct rsnd_mod_ops rsnd_ssi_non_ops = { |
496 | .name = "ssi (non)", | 502 | .name = SSI_NAME, |
497 | }; | 503 | }; |
498 | 504 | ||
499 | /* | 505 | /* |
@@ -620,7 +626,8 @@ int rsnd_ssi_probe(struct platform_device *pdev, | |||
620 | for_each_rsnd_ssi(ssi, priv, i) { | 626 | for_each_rsnd_ssi(ssi, priv, i) { |
621 | pinfo = &info->ssi_info[i]; | 627 | pinfo = &info->ssi_info[i]; |
622 | 628 | ||
623 | snprintf(name, RSND_SSI_NAME_SIZE, "ssi.%d", i); | 629 | snprintf(name, RSND_SSI_NAME_SIZE, "%s.%d", |
630 | SSI_NAME, i); | ||
624 | 631 | ||
625 | clk = devm_clk_get(dev, name); | 632 | clk = devm_clk_get(dev, name); |
626 | if (IS_ERR(clk)) | 633 | if (IS_ERR(clk)) |