At Wed, 1 Apr 2009 19:05:39 +0200,
Daniel Mack wrote:
>
> Cleanup only, no functional change.
>
> Signed-off-by: Daniel Mack <daniel@xxxxxxxx>
Thanks, applied now to sound git tree together with the previous
patch.
Takashi
> ---
> 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%)
>
> diff --git a/sound/usb/caiaq/Makefile b/sound/usb/caiaq/Makefile
> index 23dadd5..3889996 100644
> --- a/sound/usb/caiaq/Makefile
> +++ b/sound/usb/caiaq/Makefile
> @@ -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
> diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/audio.c
> similarity index 99%
> rename from sound/usb/caiaq/caiaq-audio.c
> rename to sound/usb/caiaq/audio.c
> index cf37331..3f45c0f 100644
> --- a/sound/usb/caiaq/caiaq-audio.c
> +++ b/sound/usb/caiaq/audio.c
> @@ -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
> diff --git a/sound/usb/caiaq/caiaq-audio.h b/sound/usb/caiaq/audio.h
> similarity index 100%
> rename from sound/usb/caiaq/caiaq-audio.h
> rename to sound/usb/caiaq/audio.h
> diff --git a/sound/usb/caiaq/caiaq-control.c b/sound/usb/caiaq/control.c
> similarity index 99%
> rename from sound/usb/caiaq/caiaq-control.c
> rename to sound/usb/caiaq/control.c
> index 52685cf..305f3c3 100644
> --- a/sound/usb/caiaq/caiaq-control.c
> +++ b/sound/usb/caiaq/control.c
> @@ -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
>
> diff --git a/sound/usb/caiaq/caiaq-control.h b/sound/usb/caiaq/control.h
> similarity index 100%
> rename from sound/usb/caiaq/caiaq-control.h
> rename to sound/usb/caiaq/control.h
> diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/device.c
> similarity index 99%
> rename from sound/usb/caiaq/caiaq-device.c
> rename to sound/usb/caiaq/device.c
> index 89f8b68..6d51770 100644
> --- a/sound/usb/caiaq/caiaq-device.c
> +++ b/sound/usb/caiaq/device.c
> @@ -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 <daniel@xxxxxxxx>");
> MODULE_DESCRIPTION("caiaq USB audio, version 1.3.13");
> diff --git a/sound/usb/caiaq/caiaq-device.h b/sound/usb/caiaq/device.h
> similarity index 100%
> rename from sound/usb/caiaq/caiaq-device.h
> rename to sound/usb/caiaq/device.h
> diff --git a/sound/usb/caiaq/caiaq-input.c b/sound/usb/caiaq/input.c
> similarity index 99%
> rename from sound/usb/caiaq/caiaq-input.c
> rename to sound/usb/caiaq/input.c
> index 4451775..a48d309 100644
> --- a/sound/usb/caiaq/caiaq-input.c
> +++ b/sound/usb/caiaq/input.c
> @@ -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,
> diff --git a/sound/usb/caiaq/caiaq-input.h b/sound/usb/caiaq/input.h
> similarity index 100%
> rename from sound/usb/caiaq/caiaq-input.h
> rename to sound/usb/caiaq/input.h
> diff --git a/sound/usb/caiaq/caiaq-midi.c b/sound/usb/caiaq/midi.c
> similarity index 98%
> rename from sound/usb/caiaq/caiaq-midi.c
> rename to sound/usb/caiaq/midi.c
> index 79424c1..8fa8cd8 100644
> --- a/sound/usb/caiaq/caiaq-midi.c
> +++ b/sound/usb/caiaq/midi.c
> @@ -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)
> {
> diff --git a/sound/usb/caiaq/caiaq-midi.h b/sound/usb/caiaq/midi.h
> similarity index 100%
> rename from sound/usb/caiaq/caiaq-midi.h
> rename to sound/usb/caiaq/midi.h
> --
> 1.6.2.1
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@xxxxxxxxxxxxxxxx
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
