Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / sound / soc / samsung / ac97.c

diff --git a/sound/soc/s3c24xx/s3c-ac97.c b/sound/soc/samsung/ac97.c
similarity index 96%
rename from sound/soc/s3c24xx/s3c-ac97.c
rename to sound/soc/samsung/ac97.c
index f891eb79b5754b19fd0dd443a09481cd2eb743b1..4770a9550341a3c5cf86781ea7505254ce045855 100644 (file)
--- a/sound/soc/s3c24xx/s3c-ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -1,4 +1,4 @@
-/* sound/soc/s3c24xx/s3c-ac97.c
+/* sound/soc/samsung/ac97.c
  *
  * ALSA SoC Audio Layer - S3C AC97 Controller driver
  *     Evolved from s3c2443-ac97.c
@@ -24,8 +24,8 @@
 #include <mach/dma.h>
 #include <plat/audio.h>
 
-#include "s3c-dma.h"
-#include "s3c-ac97.h"
+#include "dma.h"
+#include "ac97.h"
 
 #define AC_CMD_ADDR(x) (x << 16)
 #define AC_CMD_DATA(x) (x & 0xffff)
@@ -122,7 +122,7 @@ static unsigned short s3c_ac97_read(struct snd_ac97 *ac97,
        data = (stat & 0xffff);
 
        if (addr != reg)
-               pr_err("s3c-ac97: req addr = %02x, rep addr = %02x\n",
+               pr_err("ac97: req addr = %02x, rep addr = %02x\n",
                        reg, addr);
 
        mutex_unlock(&s3c_ac97.lock);
@@ -334,7 +334,7 @@ static struct snd_soc_dai_ops s3c_ac97_mic_dai_ops = {
 
 static struct snd_soc_dai_driver s3c_ac97_dai[] = {
        [S3C_AC97_DAI_PCM] = {
-               .name = "s3c-ac97",
+               .name = "samsung-ac97",
                .ac97_control = 1,
                .playback = {
                        .stream_name = "AC97 Playback",
@@ -351,7 +351,7 @@ static struct snd_soc_dai_driver s3c_ac97_dai[] = {
                .ops = &s3c_ac97_dai_ops,
        },
        [S3C_AC97_DAI_MIC] = {
-               .name = "s3c-ac97-mic",
+               .name = "samsung-ac97-mic",
                .ac97_control = 1,
                .capture = {
                        .stream_name = "AC97 Mic Capture",
@@ -407,7 +407,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev)
        }
 
        if (!request_mem_region(mem_res->start,
-                               resource_size(mem_res), "s3c-ac97")) {
+                               resource_size(mem_res), "ac97")) {
                dev_err(&pdev->dev, "Unable to request register region\n");
                return -EBUSY;
        }
@@ -431,7 +431,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev)
 
        s3c_ac97.ac97_clk = clk_get(&pdev->dev, "ac97");
        if (IS_ERR(s3c_ac97.ac97_clk)) {
-               dev_err(&pdev->dev, "s3c-ac97 failed to get ac97_clock\n");
+               dev_err(&pdev->dev, "ac97 failed to get ac97_clock\n");
                ret = -ENODEV;
                goto err2;
        }
@@ -446,7 +446,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev)
        ret = request_irq(irq_res->start, s3c_ac97_irq,
                                        IRQF_DISABLED, "AC97", NULL);
        if (ret < 0) {
-               dev_err(&pdev->dev, "s3c-ac97: interrupt request failed.\n");
+               dev_err(&pdev->dev, "ac97: interrupt request failed.\n");
                goto err4;
        }
 
@@ -497,7 +497,7 @@ static struct platform_driver s3c_ac97_driver = {
        .probe  = s3c_ac97_probe,
        .remove = s3c_ac97_remove,
        .driver = {
-               .name = "s3c-ac97",
+               .name = "samsung-ac97",
                .owner = THIS_MODULE,
        },
 };
@@ -517,4 +517,4 @@ module_exit(s3c_ac97_exit);
 MODULE_AUTHOR("Jaswinder Singh, <jassi.brar@samsung.com>");
 MODULE_DESCRIPTION("AC97 driver for the Samsung SoC");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:s3c-ac97");
+MODULE_ALIAS("platform:samsung-ac97");