ALSA: move line6 usb driver into sound/usb

Promote line6 driver from staging to sound/usb/line6 directory, and
maintain through sound subsystem tree.

This commit just moves the code and adapts Makefile / Kconfig.
The further renames and misc cleanups will follow.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 815de37..9049dd9 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -46,8 +46,6 @@ source "drivers/staging/rtl8723au/Kconfig"
 
 source "drivers/staging/rts5208/Kconfig"
 
-source "drivers/staging/line6/Kconfig"
-
 source "drivers/staging/octeon/Kconfig"
 
 source "drivers/staging/octeon-usb/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 33c640b..fe26ff1 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -15,7 +15,6 @@ obj-$(CONFIG_R8712U)          += rtl8712/
 obj-$(CONFIG_R8188EU)          += rtl8188eu/
 obj-$(CONFIG_R8723AU)          += rtl8723au/
 obj-$(CONFIG_RTS5208)          += rts5208/
-obj-$(CONFIG_LINE6_USB)                += line6/
 obj-$(CONFIG_NETLOGIC_XLR_NET) += netlogic/
 obj-$(CONFIG_OCTEON_ETHERNET)  += octeon/
 obj-$(CONFIG_OCTEON_USB)       += octeon-usb/

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index d393153..a452ad7 100644 (file)
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -160,5 +160,7 @@ config SND_BCD2000
          To compile this driver as a module, choose M here: the module
          will be called snd-bcd2000.
 
+source "sound/usb/line6/Kconfig"
+
 endif  # SND_USB
 

diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index bcee406..54045b7 100644 (file)
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -25,3 +25,4 @@ obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o
 obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o
 
 obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/ hiface/ bcd2000/
+obj-$(CONFIG_LINE6_USB)                += line6/

diff --git a/drivers/staging/line6/Kconfig b/sound/usb/line6/Kconfig
similarity index 100%
rename from drivers/staging/line6/Kconfig
rename to sound/usb/line6/Kconfig

diff --git a/drivers/staging/line6/Makefile b/sound/usb/line6/Makefile
similarity index 100%
rename from drivers/staging/line6/Makefile
rename to sound/usb/line6/Makefile

diff --git a/drivers/staging/line6/audio.c b/sound/usb/line6/audio.c
similarity index 100%
rename from drivers/staging/line6/audio.c
rename to sound/usb/line6/audio.c

diff --git a/drivers/staging/line6/audio.h b/sound/usb/line6/audio.h
similarity index 100%
rename from drivers/staging/line6/audio.h
rename to sound/usb/line6/audio.h

diff --git a/drivers/staging/line6/capture.c b/sound/usb/line6/capture.c
similarity index 100%
rename from drivers/staging/line6/capture.c
rename to sound/usb/line6/capture.c

diff --git a/drivers/staging/line6/capture.h b/sound/usb/line6/capture.h
similarity index 100%
rename from drivers/staging/line6/capture.h
rename to sound/usb/line6/capture.h

diff --git a/drivers/staging/line6/driver.c b/sound/usb/line6/driver.c
similarity index 100%
rename from drivers/staging/line6/driver.c
rename to sound/usb/line6/driver.c

diff --git a/drivers/staging/line6/driver.h b/sound/usb/line6/driver.h
similarity index 100%
rename from drivers/staging/line6/driver.h
rename to sound/usb/line6/driver.h

diff --git a/drivers/staging/line6/midi.c b/sound/usb/line6/midi.c
similarity index 100%
rename from drivers/staging/line6/midi.c
rename to sound/usb/line6/midi.c

diff --git a/drivers/staging/line6/midi.h b/sound/usb/line6/midi.h
similarity index 100%
rename from drivers/staging/line6/midi.h
rename to sound/usb/line6/midi.h

diff --git a/drivers/staging/line6/midibuf.c b/sound/usb/line6/midibuf.c
similarity index 100%
rename from drivers/staging/line6/midibuf.c
rename to sound/usb/line6/midibuf.c

diff --git a/drivers/staging/line6/midibuf.h b/sound/usb/line6/midibuf.h
similarity index 100%
rename from drivers/staging/line6/midibuf.h
rename to sound/usb/line6/midibuf.h

diff --git a/drivers/staging/line6/pcm.c b/sound/usb/line6/pcm.c
similarity index 100%
rename from drivers/staging/line6/pcm.c
rename to sound/usb/line6/pcm.c

diff --git a/drivers/staging/line6/pcm.h b/sound/usb/line6/pcm.h
similarity index 100%
rename from drivers/staging/line6/pcm.h
rename to sound/usb/line6/pcm.h

diff --git a/drivers/staging/line6/playback.c b/sound/usb/line6/playback.c
similarity index 100%
rename from drivers/staging/line6/playback.c
rename to sound/usb/line6/playback.c

diff --git a/drivers/staging/line6/playback.h b/sound/usb/line6/playback.h
similarity index 100%
rename from drivers/staging/line6/playback.h
rename to sound/usb/line6/playback.h

diff --git a/drivers/staging/line6/pod.c b/sound/usb/line6/pod.c
similarity index 100%
rename from drivers/staging/line6/pod.c
rename to sound/usb/line6/pod.c

diff --git a/drivers/staging/line6/pod.h b/sound/usb/line6/pod.h
similarity index 100%
rename from drivers/staging/line6/pod.h
rename to sound/usb/line6/pod.h

diff --git a/drivers/staging/line6/podhd.c b/sound/usb/line6/podhd.c
similarity index 100%
rename from drivers/staging/line6/podhd.c
rename to sound/usb/line6/podhd.c

diff --git a/drivers/staging/line6/podhd.h b/sound/usb/line6/podhd.h
similarity index 100%
rename from drivers/staging/line6/podhd.h
rename to sound/usb/line6/podhd.h

diff --git a/drivers/staging/line6/revision.h b/sound/usb/line6/revision.h
similarity index 100%
rename from drivers/staging/line6/revision.h
rename to sound/usb/line6/revision.h

diff --git a/drivers/staging/line6/toneport.c b/sound/usb/line6/toneport.c
similarity index 100%
rename from drivers/staging/line6/toneport.c
rename to sound/usb/line6/toneport.c

diff --git a/drivers/staging/line6/toneport.h b/sound/usb/line6/toneport.h
similarity index 100%
rename from drivers/staging/line6/toneport.h
rename to sound/usb/line6/toneport.h

diff --git a/drivers/staging/line6/usbdefs.h b/sound/usb/line6/usbdefs.h
similarity index 100%
rename from drivers/staging/line6/usbdefs.h
rename to sound/usb/line6/usbdefs.h

diff --git a/drivers/staging/line6/variax.c b/sound/usb/line6/variax.c
similarity index 100%
rename from drivers/staging/line6/variax.c
rename to sound/usb/line6/variax.c

diff --git a/drivers/staging/line6/variax.h b/sound/usb/line6/variax.h
similarity index 100%
rename from drivers/staging/line6/variax.h
rename to sound/usb/line6/variax.h