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>

diff --git a/drivers/usb/renesas_usbhs/Kconfig b/drivers/usb/renesas_usbhs/Kconfig
index 286cbf1ca7de7e94663e6de3cbfb3e5272c7af23..97a44016def144439dda85261600f4d4d4b26fc8 100644 (file)
--- a/drivers/usb/renesas_usbhs/Kconfig
+++ b/drivers/usb/renesas_usbhs/Kconfig
@@ -5,6 +5,7 @@
 config USB_RENESAS_USBHS
        tristate 'Renesas USBHS controller'
        depends on SUPERH || ARCH_SHMOBILE
+       depends on USB && USB_GADGET
        default n
        help
          Renesas USBHS is a discrete USB host and peripheral controller chip

diff --git a/drivers/usb/renesas_usbhs/Makefile b/drivers/usb/renesas_usbhs/Makefile
index e44984d233f7ff3fed22f81d0a7b7c6e4afe30b7..bc8aef4311a1c8a0675ac1e90cfa76a773279f83 100644 (file)
--- a/drivers/usb/renesas_usbhs/Makefile
+++ b/drivers/usb/renesas_usbhs/Makefile
@@ -6,5 +6,10 @@ obj-$(CONFIG_USB_RENESAS_USBHS)        += renesas_usbhs.o
 
 renesas_usbhs-y                        := common.o mod.o pipe.o fifo.o
 
-renesas_usbhs-$(CONFIG_USB_RENESAS_USBHS_HCD)  += mod_host.o
-renesas_usbhs-$(CONFIG_USB_RENESAS_USBHS_UDC)  += mod_gadget.o
+ifneq ($(CONFIG_USB_RENESAS_USBHS_HCD),)
+       renesas_usbhs-y         += mod_host.o
+endif
+
+ifneq ($(CONFIG_USB_RENESAS_USBHS_UDC),)
+       renesas_usbhs-y         += mod_gadget.o
+endif

diff --git a/drivers/usb/renesas_usbhs/mod.h b/drivers/usb/renesas_usbhs/mod.h
index 1f28ed2e9abeaef43c485602a9d785c0fa7744d7..8ae3733031cdb8fa17ec146d31e5d42e9eea120a 100644 (file)
--- a/drivers/usb/renesas_usbhs/mod.h
+++ b/drivers/usb/renesas_usbhs/mod.h
@@ -141,7 +141,8 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod);
 /*
  * host / gadget control
  */
-#ifdef CONFIG_USB_RENESAS_USBHS_HCD
+#if    defined(CONFIG_USB_RENESAS_USBHS_HCD) || \
+       defined(CONFIG_USB_RENESAS_USBHS_HCD_MODULE)
 extern int __devinit usbhs_mod_host_probe(struct usbhs_priv *priv);
 extern int __devexit usbhs_mod_host_remove(struct usbhs_priv *priv);
 #else
@@ -154,7 +155,8 @@ static inline void usbhs_mod_host_remove(struct usbhs_priv *priv)
 }
 #endif
 
-#ifdef CONFIG_USB_RENESAS_USBHS_UDC
+#if    defined(CONFIG_USB_RENESAS_USBHS_UDC) || \
+       defined(CONFIG_USB_RENESAS_USBHS_UDC_MODULE)
 extern int __devinit usbhs_mod_gadget_probe(struct usbhs_priv *priv);
 extern void __devexit usbhs_mod_gadget_remove(struct usbhs_priv *priv);
 #else