From d98ed1badf5912fda0a9f2f1aa49b228ac7c2804 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@skynet.be>
Date: Sun, 21 Jun 2009 23:21:55 +0200
Subject: [PATCH] --- yaml --- r: 164951 b: refs/heads/master c:
 b95cd7ec3e93bae199e820bd65b21b23e4538acc h: refs/heads/master i:   164949:
 bd46280967061f40aa2d709b6ac3628db4fb4b94   164947:
 318314896f4183ef114493de44766dba0d37eba0   164943:
 1fce0df066027a06b02f44c1c3dc332dd345a682 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/usb/gadget/f_audio.c | 15 +++++++++++++++
 trunk/include/linux/usb/audio.h    | 12 ------------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index b81048b69969..a19445b4af6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 512ad27d8667158747de2e8da8a23e8f50e91856
+refs/heads/master: b95cd7ec3e93bae199e820bd65b21b23e4538acc
diff --git a/trunk/drivers/usb/gadget/f_audio.c b/trunk/drivers/usb/gadget/f_audio.c
index 7b05b3c8c0b1..98e9bb977291 100644
--- a/trunk/drivers/usb/gadget/f_audio.c
+++ b/trunk/drivers/usb/gadget/f_audio.c
@@ -28,6 +28,9 @@ static int audio_buf_size = 48000;
 module_param(audio_buf_size, int, S_IRUGO);
 MODULE_PARM_DESC(audio_buf_size, "Audio buffer size");
 
+static int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value);
+static int generic_get_cmd(struct usb_audio_control *con, u8 cmd);
+
 /*
  * DESCRIPTORS ... most are static, but strings and full
  * configuration descriptors are built on demand.
@@ -632,6 +635,18 @@ f_audio_unbind(struct usb_configuration *c, struct usb_function *f)
 
 /*-------------------------------------------------------------------------*/
 
+static int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value)
+{
+	con->data[cmd] = value;
+
+	return 0;
+}
+
+static int generic_get_cmd(struct usb_audio_control *con, u8 cmd)
+{
+	return con->data[cmd];
+}
+
 /* Todo: add more control selecotor dynamically */
 int __init control_selector_init(struct f_audio *audio)
 {
diff --git a/trunk/include/linux/usb/audio.h b/trunk/include/linux/usb/audio.h
index c3edfcb72c34..7b33c493917f 100644
--- a/trunk/include/linux/usb/audio.h
+++ b/trunk/include/linux/usb/audio.h
@@ -285,18 +285,6 @@ struct usb_audio_control {
 	int (*get)(struct usb_audio_control *con, u8 cmd);
 };
 
-static inline int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value)
-{
-	con->data[cmd] = value;
-
-	return 0;
-}
-
-static inline int generic_get_cmd(struct usb_audio_control *con, u8 cmd)
-{
-	return con->data[cmd];
-}
-
 struct usb_audio_control_selector {
 	struct list_head list;
 	struct list_head control;