snd-usb-caiaq: rename files to remove redundant information in file pathes
Subsystems (2)
PATCH 1/1 snd-usb-caiaq: rename files to remove redundant information in file pathes
Cleanup only, no functional change.
Signed-off-by Daniel Mack <[email protected]>
---
sound/usb/caiaq/Makefile | 4 ++--
sound/usb/caiaq/{caiaq-audio.c => audio.c} | 4 ++--
sound/usb/caiaq/{caiaq-audio.h => audio.h} | 0
sound/usb/caiaq/{caiaq-control.c => control.c} | 4 ++--
sound/usb/caiaq/{caiaq-control.h => control.h} | 0
sound/usb/caiaq/{caiaq-device.c => device.c} | 10 +++++-----
sound/usb/caiaq/{caiaq-device.h => device.h} | 0
sound/usb/caiaq/{caiaq-input.c => input.c} | 5 +++--
sound/usb/caiaq/{caiaq-input.h => input.h} | 0
sound/usb/caiaq/{caiaq-midi.c => midi.c} | 4 ++--
sound/usb/caiaq/{caiaq-midi.h => midi.h} | 0
11 files changed, 16 insertions(+), 15 deletions(-)
rename sound/usb/caiaq/{caiaq-audio.c => audio.c} (99%)
rename sound/usb/caiaq/{caiaq-audio.h => audio.h} (100%)
rename sound/usb/caiaq/{caiaq-control.c => control.c} (99%)
rename sound/usb/caiaq/{caiaq-control.h => control.h} (100%)
rename sound/usb/caiaq/{caiaq-device.c => device.c} (99%)
rename sound/usb/caiaq/{caiaq-device.h => device.h} (100%)
rename sound/usb/caiaq/{caiaq-input.c => input.c} (99%)
rename sound/usb/caiaq/{caiaq-input.h => input.h} (100%)
rename sound/usb/caiaq/{caiaq-midi.c => midi.c} (98%)
rename sound/usb/caiaq/{caiaq-midi.h => midi.h} (100%)sound/usb/caiaq/Makefile +2 -2
@@ -1,4 +1,4 @@ -snd-usb-caiaq-y := caiaq-device.o caiaq-audio.o caiaq-midi.o caiaq-control.o -snd-usb-caiaq-$(CONFIG_SND_USB_CAIAQ_INPUT) += caiaq-input.o +snd-usb-caiaq-y := device.o audio.o midi.o control.o +snd-usb-caiaq-$(CONFIG_SND_USB_CAIAQ_INPUT) += input.o obj-$(CONFIG_SND_USB_CAIAQ) += snd-usb-caiaq.o
sound/usb/caiaq/audio.c renamed from sound/usb/caiaq/caiaq-audio.c +2 -2
@@ -22,8 +22,8 @@#include <sound/core.h> #include <sound/pcm.h> -#include "caiaq-device.h" -#include "caiaq-audio.h" +#include "device.h" +#include "audio.h" #define N_URBS 32#define CLOCK_DRIFT_TOLERANCE 5
sound/usb/caiaq/audio.h renamed from sound/usb/caiaq/caiaq-audio.h +0 -0
sound/usb/caiaq/control.c renamed from sound/usb/caiaq/caiaq-control.c +2 -2
@@ -23,8 +23,8 @@#include <sound/core.h> #include <sound/pcm.h> -#include "caiaq-device.h" -#include "caiaq-control.h" +#include "device.h" +#include "control.h" #define CNT_INTVAL 0x10000
sound/usb/caiaq/control.h renamed from sound/usb/caiaq/caiaq-control.h +0 -0
sound/usb/caiaq/device.c renamed from sound/usb/caiaq/caiaq-device.c +5 -5
@@ -28,11 +28,11 @@#include <sound/core.h> #include <sound/pcm.h> -#include "caiaq-device.h" -#include "caiaq-audio.h" -#include "caiaq-midi.h" -#include "caiaq-control.h" -#include "caiaq-input.h" +#include "device.h" +#include "audio.h" +#include "midi.h" +#include "control.h" +#include "input.h" MODULE_AUTHOR ("Daniel Mack <[email protected]>" );MODULE_DESCRIPTION ("caiaq USB audio, version 1.3.13" );
sound/usb/caiaq/device.h renamed from sound/usb/caiaq/caiaq-device.h +0 -0
sound/usb/caiaq/input.c renamed from sound/usb/caiaq/caiaq-input.c +3 -2
@@ -20,8 +20,9 @@#include <linux/usb.h> #include <linux/usb/input.h> #include <sound/pcm.h> -#include "caiaq-device.h" -#include "caiaq-input.h" + +#include "device.h" +#include "input.h" static unsigned short keycode_ak1[] = {KEY_C ,KEY_B ,KEY_A };static unsigned short keycode_rk2[] = {KEY_1 ,KEY_2 ,KEY_3 ,KEY_4 ,
sound/usb/caiaq/input.h renamed from sound/usb/caiaq/caiaq-input.h +0 -0
sound/usb/caiaq/midi.c renamed from sound/usb/caiaq/caiaq-midi.c +2 -2
@@ -21,8 +21,8 @@#include <sound/core.h> #include <sound/pcm.h> -#include "caiaq-device.h" -#include "caiaq-midi.h" +#include "device.h" +#include "midi.h" static int snd_usb_caiaq_midi_input_open (struct snd_rawmidi_substream *substream) {
sound/usb/caiaq/midi.h renamed from sound/usb/caiaq/caiaq-midi.h +0 -0
Signature · 1 line
1.6.2.1
Takashi Iwai
AppliedAt Wed, 1 Apr 2009 19:05:39 +0200,
Quoted 4 lines · Daniel Mack
Cleanup only, no functional change.
Signed-off-by Daniel Mack <[email protected]>
Thanks, applied now to sound git tree together with the previous patch.
Takashi
Quoted 160 lines
--- sound/usb/caiaq/Makefile | 4 ++-- sound/usb/caiaq/{caiaq-audio.c => audio.c} | 4 ++-- sound/usb/caiaq/{caiaq-audio.h => audio.h} | 0 sound/usb/caiaq/{caiaq-control.c => control.c} | 4 ++-- sound/usb/caiaq/{caiaq-control.h => control.h} | 0 sound/usb/caiaq/{caiaq-device.c => device.c} | 10 +++++----- sound/usb/caiaq/{caiaq-device.h => device.h} | 0 sound/usb/caiaq/{caiaq-input.c => input.c} | 5 +++-- sound/usb/caiaq/{caiaq-input.h => input.h} | 0 sound/usb/caiaq/{caiaq-midi.c => midi.c} | 4 ++-- sound/usb/caiaq/{caiaq-midi.h => midi.h} | 0 11 files changed, 16 insertions(+), 15 deletions(-) rename sound/usb/caiaq/{caiaq-audio.c => audio.c} (99%) rename sound/usb/caiaq/{caiaq-audio.h => audio.h} (100%) rename sound/usb/caiaq/{caiaq-control.c => control.c} (99%) rename sound/usb/caiaq/{caiaq-control.h => control.h} (100%) rename sound/usb/caiaq/{caiaq-device.c => device.c} (99%) rename sound/usb/caiaq/{caiaq-device.h => device.h} (100%) rename sound/usb/caiaq/{caiaq-input.c => input.c} (99%) rename sound/usb/caiaq/{caiaq-input.h => input.h} (100%) rename sound/usb/caiaq/{caiaq-midi.c => midi.c} (98%) rename sound/usb/caiaq/{caiaq-midi.h => midi.h} (100%)sound/usb/caiaq/Makefile +2
-2@@ -1,4 +1,4 @@ -snd-usb-caiaq-y := caiaq-device.o caiaq-audio.o caiaq-midi.o caiaq-control.o -snd-usb-caiaq-$(CONFIG_SND_USB_CAIAQ_INPUT) += caiaq-input.o +snd-usb-caiaq-y := device.o audio.o midi.o control.o +snd-usb-caiaq-$(CONFIG_SND_USB_CAIAQ_INPUT) += input.o obj-$(CONFIG_SND_USB_CAIAQ) += snd-usb-caiaq.osound/usb/caiaq/audio.c renamed from sound/usb/caiaq/caiaq-audio.c +2
-2@@ -22,8 +22,8 @@#include <sound/core.h> #include <sound/pcm.h> -#include "caiaq-device.h" -#include "caiaq-audio.h" +#include "device.h" +#include "audio.h" #define N_URBS 32#define CLOCK_DRIFT_TOLERANCE 5sound/usb/caiaq/audio.h renamed from sound/usb/caiaq/caiaq-audio.h +0
-0sound/usb/caiaq/control.c renamed from sound/usb/caiaq/caiaq-control.c +2
-2@@ -23,8 +23,8 @@#include <sound/core.h> #include <sound/pcm.h> -#include "caiaq-device.h" -#include "caiaq-control.h" +#include "device.h" +#include "control.h" #define CNT_INTVAL 0x10000sound/usb/caiaq/control.h renamed from sound/usb/caiaq/caiaq-control.h +0
-0sound/usb/caiaq/device.c renamed from sound/usb/caiaq/caiaq-device.c +5
-5@@ -28,11 +28,11 @@#include <sound/core.h> #include <sound/pcm.h> -#include "caiaq-device.h" -#include "caiaq-audio.h" -#include "caiaq-midi.h" -#include "caiaq-control.h" -#include "caiaq-input.h" +#include "device.h" +#include "audio.h" +#include "midi.h" +#include "control.h" +#include "input.h" MODULE_AUTHOR ("Daniel Mack <[email protected]>" );MODULE_DESCRIPTION ("caiaq USB audio, version 1.3.13" );sound/usb/caiaq/device.h renamed from sound/usb/caiaq/caiaq-device.h +0
-0sound/usb/caiaq/input.c renamed from sound/usb/caiaq/caiaq-input.c +3
-2@@ -20,8 +20,9 @@#include <linux/usb.h> #include <linux/usb/input.h> #include <sound/pcm.h> -#include "caiaq-device.h" -#include "caiaq-input.h" + +#include "device.h" +#include "input.h" static unsigned short keycode_ak1[] = {KEY_C ,KEY_B ,KEY_A };static unsigned short keycode_rk2[] = {KEY_1 ,KEY_2 ,KEY_3 ,KEY_4 ,sound/usb/caiaq/input.h renamed from sound/usb/caiaq/caiaq-input.h +0
-0sound/usb/caiaq/midi.c renamed from sound/usb/caiaq/caiaq-midi.c +2
-2@@ -21,8 +21,8 @@#include <sound/core.h> #include <sound/pcm.h> -#include "caiaq-device.h" -#include "caiaq-midi.h" +#include "device.h" +#include "midi.h" static int snd_usb_caiaq_midi_input_open (struct snd_rawmidi_substream *substream) {sound/usb/caiaq/midi.h renamed from sound/usb/caiaq/caiaq-midi.h +0
-0Signature · 6 lines
1.6.2.1 _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel