From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 28 Jan 2015 13:50:08 +0000 (+0100)
Subject: ALSA: line6: Move the contents of usbdefs.h into driver.h
X-Git-Tag: v4.0-rc1~129^2~28^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=129b3be6895c01e137dbb88c699f9f706bdc6c9d;p=linux.git

ALSA: line6: Move the contents of usbdefs.h into driver.h

Most of them are rather relevant with the definitions in driver.h,
and there are only a few lines, so just rip it off.

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

diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 786b38159ad6..2328ec9a1ca8 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -22,7 +22,6 @@
 #include "driver.h"
 #include "midi.h"
 #include "playback.h"
-#include "usbdefs.h"
 
 #define DRIVER_AUTHOR  "Markus Grabner <grabner@icg.tugraz.at>"
 #define DRIVER_DESC    "Line 6 USB Driver"
diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h
index 80d42a0fd889..fa877a345860 100644
--- a/sound/usb/line6/driver.h
+++ b/sound/usb/line6/driver.h
@@ -20,6 +20,12 @@
 
 #define DRIVER_NAME "line6usb"
 
+#define USB_INTERVALS_PER_SECOND 1000
+
+/* Fallback USB interval and max packet size values */
+#define LINE6_FALLBACK_INTERVAL 10
+#define LINE6_FALLBACK_MAXPACKETSIZE 16
+
 #define LINE6_TIMEOUT 1
 #define LINE6_BUFSIZE_LISTEN 32
 #define LINE6_MESSAGE_MAXLEN 256
@@ -84,6 +90,16 @@ struct line6_properties {
 	unsigned ep_audio_w;
 };
 
+/* Capability bits */
+enum {
+	/* device supports settings parameter via USB */
+	LINE6_CAP_CONTROL =	1 << 0,
+	/* device supports PCM input/output via USB */
+	LINE6_CAP_PCM =		1 << 1,
+	/* device support hardware monitoring */
+	LINE6_CAP_HWMON =	1 << 2,
+};
+
 /*
 	 Common data shared by all Line 6 devices.
 	 Corresponds to a pair of USB endpoints.
diff --git a/sound/usb/line6/midi.c b/sound/usb/line6/midi.c
index beeedf9a2cbe..cebea9b7f769 100644
--- a/sound/usb/line6/midi.c
+++ b/sound/usb/line6/midi.c
@@ -17,7 +17,6 @@
 
 #include "driver.h"
 #include "midi.h"
-#include "usbdefs.h"
 
 #define line6_rawmidi_substream_midi(substream) \
 	((struct snd_line6_midi *)((substream)->rmidi->private_data))
diff --git a/sound/usb/line6/pcm.h b/sound/usb/line6/pcm.h
index 19c12f0a9008..3a3cfba40ec7 100644
--- a/sound/usb/line6/pcm.h
+++ b/sound/usb/line6/pcm.h
@@ -19,7 +19,6 @@
 #include <sound/pcm.h>
 
 #include "driver.h"
-#include "usbdefs.h"
 
 /* number of URBs */
 #define LINE6_ISO_BUFFERS	2
diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c
index bc20cf141719..3f7ff661b3dd 100644
--- a/sound/usb/line6/pod.c
+++ b/sound/usb/line6/pod.c
@@ -21,7 +21,6 @@
 #include "capture.h"
 #include "driver.h"
 #include "playback.h"
-#include "usbdefs.h"
 
 /*
 	Locate name in binary program dump
diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c
index c4e83ab33a21..5e4e02c1f4b5 100644
--- a/sound/usb/line6/podhd.c
+++ b/sound/usb/line6/podhd.c
@@ -17,7 +17,6 @@
 
 #include "driver.h"
 #include "pcm.h"
-#include "usbdefs.h"
 
 enum {
 	LINE6_PODHD300,
diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c
index 9024acb2b850..cffcd7f83bfd 100644
--- a/sound/usb/line6/toneport.c
+++ b/sound/usb/line6/toneport.c
@@ -21,7 +21,6 @@
 #include "capture.h"
 #include "driver.h"
 #include "playback.h"
-#include "usbdefs.h"
 
 enum line6_device_type {
 	LINE6_GUITARPORT,
diff --git a/sound/usb/line6/usbdefs.h b/sound/usb/line6/usbdefs.h
deleted file mode 100644
index 5ef7bcd24e18..000000000000
--- a/sound/usb/line6/usbdefs.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Line 6 Linux USB driver
- *
- * Copyright (C) 2005-2008 Markus Grabner (grabner@icg.tugraz.at)
- *
- *	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 Free Software Foundation, version 2.
- *
- */
-
-#ifndef USBDEFS_H
-#define USBDEFS_H
-
-#define USB_INTERVALS_PER_SECOND 1000
-
-/* device supports settings parameter via USB */
-#define LINE6_CAP_CONTROL (1 << 0)
-/* device supports PCM input/output via USB */
-#define LINE6_CAP_PCM (1 << 1)
-/* device support hardware monitoring */
-#define LINE6_CAP_HWMON (1 << 2)
-
-#define LINE6_FALLBACK_INTERVAL 10
-#define LINE6_FALLBACK_MAXPACKETSIZE 16
-
-#endif
diff --git a/sound/usb/line6/variax.c b/sound/usb/line6/variax.c
index 44042cbdef01..9dfbe7916d99 100644
--- a/sound/usb/line6/variax.c
+++ b/sound/usb/line6/variax.c
@@ -17,7 +17,6 @@
 #include <sound/core.h>
 
 #include "driver.h"
-#include "usbdefs.h"
 
 #define VARIAX_STARTUP_DELAY1 1000
 #define VARIAX_STARTUP_DELAY3 100