diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-03 13:21:52 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-03 14:19:10 -0500 |
commit | dc7d7b830ee1f4111696e73d1c25da683b461548 (patch) | |
tree | 4b15c46c97756605dcf9baa3b2de2e1af2570264 /sound/soc/s3c24xx | |
parent | 07c84d0409f3551b79d676630d8ee76bb551598d (diff) |
ASoC: Remove platform device from DAI suspend and resume operations
None of the DAIs use it except s3c2412-i2s which only uses it for
dev_() printouts.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx')
-rw-r--r-- | sound/soc/s3c24xx/s3c2412-i2s.c | 16 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-i2s.c | 6 |
2 files changed, 9 insertions, 13 deletions
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index 1c741047ae35..75f87c3c74d0 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c | |||
@@ -649,8 +649,7 @@ static int s3c2412_i2s_probe(struct platform_device *pdev, | |||
649 | } | 649 | } |
650 | 650 | ||
651 | #ifdef CONFIG_PM | 651 | #ifdef CONFIG_PM |
652 | static int s3c2412_i2s_suspend(struct platform_device *dev, | 652 | static int s3c2412_i2s_suspend(struct snd_soc_dai *dai) |
653 | struct snd_soc_dai *dai) | ||
654 | { | 653 | { |
655 | struct s3c2412_i2s_info *i2s = &s3c2412_i2s; | 654 | struct s3c2412_i2s_info *i2s = &s3c2412_i2s; |
656 | u32 iismod; | 655 | u32 iismod; |
@@ -665,25 +664,24 @@ static int s3c2412_i2s_suspend(struct platform_device *dev, | |||
665 | iismod = readl(i2s->regs + S3C2412_IISMOD); | 664 | iismod = readl(i2s->regs + S3C2412_IISMOD); |
666 | 665 | ||
667 | if (iismod & S3C2412_IISCON_RXDMA_ACTIVE) | 666 | if (iismod & S3C2412_IISCON_RXDMA_ACTIVE) |
668 | dev_warn(&dev->dev, "%s: RXDMA active?\n", __func__); | 667 | pr_warning("%s: RXDMA active?\n", __func__); |
669 | 668 | ||
670 | if (iismod & S3C2412_IISCON_TXDMA_ACTIVE) | 669 | if (iismod & S3C2412_IISCON_TXDMA_ACTIVE) |
671 | dev_warn(&dev->dev, "%s: TXDMA active?\n", __func__); | 670 | pr_warning("%s: TXDMA active?\n", __func__); |
672 | 671 | ||
673 | if (iismod & S3C2412_IISCON_IIS_ACTIVE) | 672 | if (iismod & S3C2412_IISCON_IIS_ACTIVE) |
674 | dev_warn(&dev->dev, "%s: IIS active\n", __func__); | 673 | pr_warning("%s: IIS active\n", __func__); |
675 | } | 674 | } |
676 | 675 | ||
677 | return 0; | 676 | return 0; |
678 | } | 677 | } |
679 | 678 | ||
680 | static int s3c2412_i2s_resume(struct platform_device *pdev, | 679 | static int s3c2412_i2s_resume(struct snd_soc_dai *dai) |
681 | struct snd_soc_dai *dai) | ||
682 | { | 680 | { |
683 | struct s3c2412_i2s_info *i2s = &s3c2412_i2s; | 681 | struct s3c2412_i2s_info *i2s = &s3c2412_i2s; |
684 | 682 | ||
685 | dev_info(&pdev->dev, "dai_active %d, IISMOD %08x, IISCON %08x\n", | 683 | pr_info("dai_active %d, IISMOD %08x, IISCON %08x\n", |
686 | dai->active, i2s->suspend_iismod, i2s->suspend_iiscon); | 684 | dai->active, i2s->suspend_iismod, i2s->suspend_iiscon); |
687 | 685 | ||
688 | if (dai->active) { | 686 | if (dai->active) { |
689 | writel(i2s->suspend_iiscon, i2s->regs + S3C2412_IISCON); | 687 | writel(i2s->suspend_iiscon, i2s->regs + S3C2412_IISCON); |
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index 8d9135f41bc9..45fe8f7c88ab 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c | |||
@@ -419,8 +419,7 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev, | |||
419 | } | 419 | } |
420 | 420 | ||
421 | #ifdef CONFIG_PM | 421 | #ifdef CONFIG_PM |
422 | static int s3c24xx_i2s_suspend(struct platform_device *pdev, | 422 | static int s3c24xx_i2s_suspend(struct snd_soc_dai *cpu_dai) |
423 | struct snd_soc_dai *cpu_dai) | ||
424 | { | 423 | { |
425 | DBG("Entered %s\n", __func__); | 424 | DBG("Entered %s\n", __func__); |
426 | 425 | ||
@@ -434,8 +433,7 @@ static int s3c24xx_i2s_suspend(struct platform_device *pdev, | |||
434 | return 0; | 433 | return 0; |
435 | } | 434 | } |
436 | 435 | ||
437 | static int s3c24xx_i2s_resume(struct platform_device *pdev, | 436 | static int s3c24xx_i2s_resume(struct snd_soc_dai *cpu_dai) |
438 | struct snd_soc_dai *cpu_dai) | ||
439 | { | 437 | { |
440 | DBG("Entered %s\n", __func__); | 438 | DBG("Entered %s\n", __func__); |
441 | clk_enable(s3c24xx_i2s.iis_clk); | 439 | clk_enable(s3c24xx_i2s.iis_clk); |