ASoC: Samsung: Rename ASoC DMA driver

Rename Samsung ASoC DMA driver s3c-dma.[c/h] -> dma.[c/h] Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2025-01-19 02:36:25 +07:00 · 2010-11-22 15:35:57 +09:00 · 2010-11-22 15:35:57 +09:00 · 4b640cf309
commit 4b640cf309
parent 83e37b8e40
26 changed files with 28 additions and 28 deletions
--- a/sound/soc/s3c24xx/Makefile
+++ b/sound/soc/s3c24xx/Makefile
@ -1,5 +1,5 @@
 # S3c24XX Platform Support
-snd-soc-s3c24xx-objs := s3c-dma.o
+snd-soc-s3c24xx-objs := dma.o
 snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o
 snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o
 snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o
--- a/sound/soc/s3c24xx/s3c-dma.c
+++ b/sound/soc/s3c24xx/s3c-dma.c
@ -1,5 +1,5 @@
 /*
- * s3c-dma.c  --  ALSA Soc Audio Layer
+ * dma.c  --  ALSA Soc Audio Layer
 *
 * (c) 2006 Wolfson Microelectronics PLC.
 * Graeme Gregory graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com
@ -30,7 +30,7 @@
 #include <mach/hardware.h>
 #include <mach/dma.h>

-#include "s3c-dma.h"
+#include "dma.h"

 static const struct snd_pcm_hardware s3c_dma_hardware = {
 	.info			= SNDRV_PCM_INFO_INTERLEAVED |
@ -453,7 +453,7 @@ static int s3c_dma_new(struct snd_card *card,
 		if (ret)
 			goto out;
 	}
- out:
+out:
 	return ret;
 }

--- a/sound/soc/s3c24xx/s3c-dma.h
+++ b/sound/soc/s3c24xx/s3c-dma.h
@ -1,5 +1,5 @@
 /*
- *  s3c-dma.h --
+ *  dma.h --
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
--- a/sound/soc/s3c24xx/goni_wm8994.c
+++ b/sound/soc/s3c24xx/goni_wm8994.c
@ -24,7 +24,7 @@
 #include <linux/mfd/wm8994/core.h>
 #include <linux/mfd/wm8994/registers.h>
 #include "../codecs/wm8994.h"
-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c64xx-i2s.h"

 #define MACHINE_NAME	0
--- a/sound/soc/s3c24xx/jive_wm8750.c
+++ b/sound/soc/s3c24xx/jive_wm8750.c
@ -24,7 +24,7 @@

 #include <asm/mach-types.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c2412-i2s.h"

 #include "../codecs/wm8750.h"
--- a/sound/soc/s3c24xx/ln2440sbc_alc650.c
+++ b/sound/soc/s3c24xx/ln2440sbc_alc650.c
@ -22,7 +22,7 @@
 #include <sound/pcm.h>
 #include <sound/soc.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c-ac97.h"

 static struct snd_soc_card ln2440sbc;
--- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
@ -31,7 +31,7 @@
 #include <asm/io.h>
 #include <mach/gta02.h>
 #include "../codecs/wm8753.h"
-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c24xx-i2s.h"

 static struct snd_soc_card neo1973_gta02;
--- a/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
@ -35,7 +35,7 @@

 #include "../codecs/wm8753.h"
 #include "lm4857.h"
-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c24xx-i2s.h"

 /* define the scenarios */
--- a/sound/soc/s3c24xx/rx1950_uda1380.c
+++ b/sound/soc/s3c24xx/rx1950_uda1380.c
@ -34,7 +34,7 @@

 #include <asm/mach-types.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c24xx-i2s.h"
 #include "../codecs/uda1380.h"

--- a/sound/soc/s3c24xx/s3c-ac97.c
+++ b/sound/soc/s3c24xx/s3c-ac97.c
@ -24,7 +24,7 @@
 #include <mach/dma.h>
 #include <plat/audio.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c-ac97.h"

 #define AC_CMD_ADDR(x) (x << 16)
--- a/sound/soc/s3c24xx/s3c-i2s-v2.c
+++ b/sound/soc/s3c24xx/s3c-i2s-v2.c
@ -28,7 +28,7 @@

 #include "regs-i2s-v2.h"
 #include "s3c-i2s-v2.h"
-#include "s3c-dma.h"
+#include "dma.h"

 #undef S3C_IIS_V2_SUPPORTED

--- a/sound/soc/s3c24xx/s3c-pcm.c
+++ b/sound/soc/s3c24xx/s3c-pcm.c
@ -29,7 +29,7 @@
 #include <plat/audio.h>
 #include <plat/dma.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c-pcm.h"

 static struct s3c2410_dma_client s3c_pcm_dma_client_out = {
--- a/sound/soc/s3c24xx/s3c2412-i2s.c
+++ b/sound/soc/s3c24xx/s3c2412-i2s.c
@ -35,7 +35,7 @@
 #include <mach/regs-gpio.h>
 #include <mach/dma.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "regs-i2s-v2.h"
 #include "s3c2412-i2s.h"

--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
@ -38,7 +38,7 @@

 #include <plat/regs-iis.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c24xx-i2s.h"

 static struct s3c2410_dma_client s3c24xx_dma_client_out = {
--- a/sound/soc/s3c24xx/s3c24xx_simtec.c
+++ b/sound/soc/s3c24xx/s3c24xx_simtec.c
@ -20,7 +20,7 @@

 #include <plat/audio-simtec.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c24xx-i2s.h"
 #include "s3c24xx_simtec.h"

--- a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c
+++ b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c
@ -17,7 +17,7 @@

 #include <plat/audio-simtec.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c24xx-i2s.h"
 #include "s3c24xx_simtec.h"

--- a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c
+++ b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c
@ -17,7 +17,7 @@

 #include <plat/audio-simtec.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c24xx-i2s.h"
 #include "s3c24xx_simtec.h"

--- a/sound/soc/s3c24xx/s3c24xx_uda134x.c
+++ b/sound/soc/s3c24xx/s3c24xx_uda134x.c
@ -23,7 +23,7 @@

 #include <plat/regs-iis.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c24xx-i2s.h"
 #include "../codecs/uda134x.h"

--- a/sound/soc/s3c24xx/s3c64xx-i2s-v4.c
+++ b/sound/soc/s3c24xx/s3c64xx-i2s-v4.c
@ -21,7 +21,7 @@
 #include <mach/map.h>
 #include <mach/dma.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "regs-i2s-v2.h"
 #include "s3c64xx-i2s.h"

--- a/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.c
@ -25,7 +25,7 @@
 #include <mach/map.h>
 #include <mach/dma.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "regs-i2s-v2.h"
 #include "s3c64xx-i2s.h"

--- a/sound/soc/s3c24xx/smartq_wm8987.c
+++ b/sound/soc/s3c24xx/smartq_wm8987.c
@ -24,7 +24,7 @@

 #include <asm/mach-types.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c64xx-i2s.h"

 #include "../codecs/wm8750.h"
--- a/sound/soc/s3c24xx/smdk2443_wm9710.c
+++ b/sound/soc/s3c24xx/smdk2443_wm9710.c
@ -18,7 +18,7 @@
 #include <sound/pcm.h>
 #include <sound/soc.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c-ac97.h"

 static struct snd_soc_card smdk2443;
--- a/sound/soc/s3c24xx/smdk64xx_wm8580.c
+++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c
@ -18,7 +18,7 @@
 #include <sound/soc.h>

 #include "../codecs/wm8580.h"
-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c64xx-i2s.h"

 /*
--- a/sound/soc/s3c24xx/smdk_spdif.c
+++ b/sound/soc/s3c24xx/smdk_spdif.c
@ -18,7 +18,7 @@

 #include <sound/soc.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "spdif.h"

 /* Audio clock settings are belonged to board specific part. Every
--- a/sound/soc/s3c24xx/smdk_wm9713.c
+++ b/sound/soc/s3c24xx/smdk_wm9713.c
@ -15,7 +15,7 @@
 #include <linux/device.h>
 #include <sound/soc.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "s3c-ac97.h"

 static struct snd_soc_card smdk;
--- a/sound/soc/s3c24xx/spdif.c
+++ b/sound/soc/s3c24xx/spdif.c
@ -20,7 +20,7 @@
 #include <plat/audio.h>
 #include <mach/dma.h>

-#include "s3c-dma.h"
+#include "dma.h"
 #include "spdif.h"

 /* Registers */