diff options
author | Laurent Pinchart <laurent.pinchart@skynet.be> | 2009-06-21 17:21:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-23 09:46:20 -0400 |
commit | b95cd7ec3e93bae199e820bd65b21b23e4538acc (patch) | |
tree | c1a99b3dfd9b52bd0194d3aff6231867887d990f | |
parent | 512ad27d8667158747de2e8da8a23e8f50e91856 (diff) |
USB audio gadget: Un-inline generic_[gs]et_cmd
Those functions are used only used to fill the set/get members of
usb_audio_control. It doesn't make much sense to inline them.
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/gadget/f_audio.c | 15 | ||||
-rw-r--r-- | include/linux/usb/audio.h | 12 |
2 files changed, 15 insertions, 12 deletions
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c index 7b05b3c8c0b1..98e9bb977291 100644 --- a/drivers/usb/gadget/f_audio.c +++ b/drivers/usb/gadget/f_audio.c | |||
@@ -28,6 +28,9 @@ static int audio_buf_size = 48000; | |||
28 | module_param(audio_buf_size, int, S_IRUGO); | 28 | module_param(audio_buf_size, int, S_IRUGO); |
29 | MODULE_PARM_DESC(audio_buf_size, "Audio buffer size"); | 29 | MODULE_PARM_DESC(audio_buf_size, "Audio buffer size"); |
30 | 30 | ||
31 | static int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value); | ||
32 | static int generic_get_cmd(struct usb_audio_control *con, u8 cmd); | ||
33 | |||
31 | /* | 34 | /* |
32 | * DESCRIPTORS ... most are static, but strings and full | 35 | * DESCRIPTORS ... most are static, but strings and full |
33 | * configuration descriptors are built on demand. | 36 | * configuration descriptors are built on demand. |
@@ -632,6 +635,18 @@ f_audio_unbind(struct usb_configuration *c, struct usb_function *f) | |||
632 | 635 | ||
633 | /*-------------------------------------------------------------------------*/ | 636 | /*-------------------------------------------------------------------------*/ |
634 | 637 | ||
638 | static int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value) | ||
639 | { | ||
640 | con->data[cmd] = value; | ||
641 | |||
642 | return 0; | ||
643 | } | ||
644 | |||
645 | static int generic_get_cmd(struct usb_audio_control *con, u8 cmd) | ||
646 | { | ||
647 | return con->data[cmd]; | ||
648 | } | ||
649 | |||
635 | /* Todo: add more control selecotor dynamically */ | 650 | /* Todo: add more control selecotor dynamically */ |
636 | int __init control_selector_init(struct f_audio *audio) | 651 | int __init control_selector_init(struct f_audio *audio) |
637 | { | 652 | { |
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h index c3edfcb72c34..7b33c493917f 100644 --- a/include/linux/usb/audio.h +++ b/include/linux/usb/audio.h | |||
@@ -285,18 +285,6 @@ struct usb_audio_control { | |||
285 | int (*get)(struct usb_audio_control *con, u8 cmd); | 285 | int (*get)(struct usb_audio_control *con, u8 cmd); |
286 | }; | 286 | }; |
287 | 287 | ||
288 | static inline int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value) | ||
289 | { | ||
290 | con->data[cmd] = value; | ||
291 | |||
292 | return 0; | ||
293 | } | ||
294 | |||
295 | static inline int generic_get_cmd(struct usb_audio_control *con, u8 cmd) | ||
296 | { | ||
297 | return con->data[cmd]; | ||
298 | } | ||
299 | |||
300 | struct usb_audio_control_selector { | 288 | struct usb_audio_control_selector { |
301 | struct list_head list; | 289 | struct list_head list; |
302 | struct list_head control; | 290 | struct list_head control; |