Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: gadget: renesas_usbhs: fixup driver compile style

In current renesas-usbhs,
there was inconsistency about the style of kernel module or built-in.
This patch solve it.

[ balbi@ti.com : fix compile issue when building modules ]

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

authored by

Kuninori Morimoto and committed by
Felipe Balbi
951fe829 48298206

+12 -4
+1
drivers/usb/renesas_usbhs/Kconfig
··· 5 5 config USB_RENESAS_USBHS 6 6 tristate 'Renesas USBHS controller' 7 7 depends on SUPERH || ARCH_SHMOBILE 8 + depends on USB && USB_GADGET 8 9 default n 9 10 help 10 11 Renesas USBHS is a discrete USB host and peripheral controller chip
+7 -2
drivers/usb/renesas_usbhs/Makefile
··· 6 6 7 7 renesas_usbhs-y := common.o mod.o pipe.o fifo.o 8 8 9 - renesas_usbhs-$(CONFIG_USB_RENESAS_USBHS_HCD) += mod_host.o 10 - renesas_usbhs-$(CONFIG_USB_RENESAS_USBHS_UDC) += mod_gadget.o 9 + ifneq ($(CONFIG_USB_RENESAS_USBHS_HCD),) 10 + renesas_usbhs-y += mod_host.o 11 + endif 12 + 13 + ifneq ($(CONFIG_USB_RENESAS_USBHS_UDC),) 14 + renesas_usbhs-y += mod_gadget.o 15 + endif
+4 -2
drivers/usb/renesas_usbhs/mod.h
··· 141 141 /* 142 142 * host / gadget control 143 143 */ 144 - #ifdef CONFIG_USB_RENESAS_USBHS_HCD 144 + #if defined(CONFIG_USB_RENESAS_USBHS_HCD) || \ 145 + defined(CONFIG_USB_RENESAS_USBHS_HCD_MODULE) 145 146 extern int __devinit usbhs_mod_host_probe(struct usbhs_priv *priv); 146 147 extern int __devexit usbhs_mod_host_remove(struct usbhs_priv *priv); 147 148 #else ··· 155 154 } 156 155 #endif 157 156 158 - #ifdef CONFIG_USB_RENESAS_USBHS_UDC 157 + #if defined(CONFIG_USB_RENESAS_USBHS_UDC) || \ 158 + defined(CONFIG_USB_RENESAS_USBHS_UDC_MODULE) 159 159 extern int __devinit usbhs_mod_gadget_probe(struct usbhs_priv *priv); 160 160 extern void __devexit usbhs_mod_gadget_remove(struct usbhs_priv *priv); 161 161 #else