From 7b377487a28c096d2294d37f85d0679150091823 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Mon, 17 Aug 2015 14:33:30 +0530 Subject: usb: gadget: audio_source function depends on SND_PCM Select f_audio_source usb function only if SND_PCM is enabled otherwise we run into following build error: ------------------------------- LD init/built-in.o drivers/built-in.o: In function `audio_data_complete': drivers/usb/gadget/function/f_audio_source.c:458: undefined reference to `snd_pcm_period_elapsed' drivers/built-in.o: In function `audio_pcm_hw_free': drivers/usb/gadget/function/f_audio_source.c:770: undefined reference to `snd_pcm_lib_free_vmalloc_buffer' drivers/built-in.o: In function `snd_pcm_lib_alloc_vmalloc_buffer': include/sound/pcm.h:1180: undefined reference to `_snd_pcm_lib_alloc_vmalloc_buffer' drivers/built-in.o: In function `audio_pcm_open': drivers/usb/gadget/function/f_audio_source.c:734: undefined reference to `snd_pcm_limit_hw_rates' drivers/built-in.o: In function `audio_source_alloc_inst': drivers/usb/gadget/function/f_audio_source.c:1011: undefined reference to `create_function_device' drivers/built-in.o: In function `snd_card_setup': drivers/usb/gadget/function/f_audio_source.c:888: undefined reference to `snd_pcm_new' drivers/usb/gadget/function/f_audio_source.c:898: undefined reference to `snd_pcm_set_ops' drivers/usb/gadget/function/f_audio_source.c:899: undefined reference to `snd_pcm_lib_preallocate_pages_for_all' drivers/built-in.o:(.data+0x20ca8): undefined reference to `snd_pcm_lib_ioctl' make: *** [vmlinux] Error 1 ------------------------------- Signed-off-by: Amit Pundir --- drivers/usb/gadget/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/usb') diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 2d9ee85903e0..23814ec22401 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -401,6 +401,7 @@ config USB_CONFIGFS_F_ACC config USB_CONFIGFS_F_AUDIO_SRC boolean "Audio Source gadget" depends on USB_CONFIGFS && USB_CONFIGFS_F_ACC + depends on SND_PCM select USB_F_AUDIO_SRC help USB gadget Audio Source support -- cgit v1.2.3 From 1f550878003f4e75b7820973f5dae1422b065f64 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Tue, 25 Aug 2015 13:09:31 +0530 Subject: usb: gadget: function: fix unused function warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use __maybe_unused attribute to fix following compiler warnings: ---------- CC drivers/usb/gadget/function/f_mtp.o drivers/usb/gadget/function/f_mtp.c:1219:12: warning: ‘mtp_bind_config’ defined but not used [-Wunused-function] drivers/usb/gadget/function/f_mtp.c:1300:12: warning: ‘mtp_setup’ defined but not used [-Wunused-function] LD drivers/usb/gadget/function/usb_f_mtp.o CC drivers/usb/gadget/function/f_accessory.o drivers/usb/gadget/function/f_accessory.c:1172:12: warning: ‘acc_bind_config’ defined but not used [-Wunused-function] LD drivers/usb/gadget/function/usb_f_accessory.o ---------- Signed-off-by: Amit Pundir --- drivers/usb/gadget/function/f_accessory.c | 2 +- drivers/usb/gadget/function/f_mtp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/usb') diff --git a/drivers/usb/gadget/function/f_accessory.c b/drivers/usb/gadget/function/f_accessory.c index dfc508d1da35..95a7bbb69fce 100644 --- a/drivers/usb/gadget/function/f_accessory.c +++ b/drivers/usb/gadget/function/f_accessory.c @@ -1169,7 +1169,7 @@ static void acc_function_disable(struct usb_function *f) VDBG(cdev, "%s disabled\n", dev->function.name); } -static int acc_bind_config(struct usb_configuration *c) +static int __maybe_unused acc_bind_config(struct usb_configuration *c) { struct acc_dev *dev = _acc_dev; int ret; diff --git a/drivers/usb/gadget/function/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c index 03a61f8b9d48..79053fda2864 100644 --- a/drivers/usb/gadget/function/f_mtp.c +++ b/drivers/usb/gadget/function/f_mtp.c @@ -1216,7 +1216,7 @@ static void mtp_function_disable(struct usb_function *f) VDBG(cdev, "%s disabled\n", dev->function.name); } -static int mtp_bind_config(struct usb_configuration *c, bool ptp_config) +static int __maybe_unused mtp_bind_config(struct usb_configuration *c, bool ptp_config) { struct mtp_dev *dev = _mtp_dev; int ret = 0; @@ -1297,7 +1297,7 @@ err1: return ret; } -static int mtp_setup(void) +static int __maybe_unused mtp_setup(void) { return __mtp_setup(NULL); } -- cgit v1.2.3 From d31309262eaa746270ddd68b19e62fea47bb2325 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Wed, 9 Sep 2015 16:12:20 +0530 Subject: usb: gadget: configfs: fix unused variable warnings Delete unused variables to fix following build warnings: -------------------- CC drivers/usb/gadget/configfs.o drivers/usb/gadget/configfs.c: In function 'gadgets_make': drivers/usb/gadget/configfs.c:1708:6: warning: unused variable 'err' [-Wunused-variable] int err; ^ drivers/usb/gadget/configfs.c:1707:27: warning: unused variable 'attr' [-Wunused-variable] struct device_attribute *attr; ^ drivers/usb/gadget/configfs.c:1706:28: warning: unused variable 'attrs' [-Wunused-variable] struct device_attribute **attrs; ^ drivers/usb/gadget/configfs.c: In function 'gadgets_drop': drivers/usb/gadget/configfs.c:1772:27: warning: unused variable 'attr' [-Wunused-variable] struct device_attribute *attr; ^ drivers/usb/gadget/configfs.c:1771:28: warning: unused variable 'attrs' [-Wunused-variable] struct device_attribute **attrs; ^ -------------------- Change-Id: Idb87fdcad0b85805e497e2fa90ce63e0b1467656 Signed-off-by: Amit Pundir --- drivers/usb/gadget/configfs.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'drivers/usb') diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c index a8c90eb085f7..fbf07ff48f18 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -1701,9 +1701,6 @@ static struct config_group *gadgets_make( const char *name) { struct gadget_info *gi; - struct device_attribute **attrs; - struct device_attribute *attr; - int err; gi = kzalloc(sizeof(*gi), GFP_KERNEL); if (!gi) @@ -1766,9 +1763,6 @@ err: static void gadgets_drop(struct config_group *group, struct config_item *item) { - struct device_attribute **attrs; - struct device_attribute *attr; - config_item_put(item); android_device_destroy(); } -- cgit v1.2.3