usb: musb: Use IS_ENABLED for tusb6010

This removes the ifdef clutter a bit and saves few lines.

It also makes it easier to detect the remaining places
where we have conditional building of code done based
on if defined for things like DMA.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 1388d99b39e0f38fbf75df0598d4eef643925a5d..55fe0ff6fd876edc55722a7683743721745a6a13 100644 (file)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1527,7 +1527,7 @@ static int musb_core_init(u16 musb_type, struct musb *musb)
                struct musb_hw_ep       *hw_ep = musb->endpoints + i;
 
                hw_ep->fifo = musb->io.fifo_offset(i) + mbase;
-#if defined(CONFIG_USB_MUSB_TUSB6010) || defined (CONFIG_USB_MUSB_TUSB6010_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_TUSB6010)
                if (musb->io.quirks & MUSB_IN_TUSB) {
                        hw_ep->fifo_async = musb->async + 0x400 +
                                musb->io.fifo_offset(i);

diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index d9248fdd9158e2885a72308b49f2b1dda02ea005..5e65958f79151ea7107df5028a954804cb91b879 100644 (file)
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -216,8 +216,7 @@ struct musb_hw_ep {
        void __iomem            *fifo;
        void __iomem            *regs;
 
-#if defined(CONFIG_USB_MUSB_TUSB6010) || \
-       defined(CONFIG_USB_MUSB_TUSB6010_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_TUSB6010)
        void __iomem            *conf;
 #endif
 
@@ -234,8 +233,7 @@ struct musb_hw_ep {
        struct dma_channel      *tx_channel;
        struct dma_channel      *rx_channel;
 
-#if defined(CONFIG_USB_MUSB_TUSB6010) || \
-       defined(CONFIG_USB_MUSB_TUSB6010_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_TUSB6010)
        /* TUSB has "asynchronous" and "synchronous" dma modes */
        dma_addr_t              fifo_async;
        dma_addr_t              fifo_sync;
@@ -339,8 +337,7 @@ struct musb {
        void __iomem            *ctrl_base;
        void __iomem            *mregs;
 
-#if defined(CONFIG_USB_MUSB_TUSB6010) || \
-       defined(CONFIG_USB_MUSB_TUSB6010_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_TUSB6010)
        dma_addr_t              async;
        dma_addr_t              sync;
        void __iomem            *sync_va;

diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index 92b4c3df9ffa22fee3697931e1ee040be229bd1e..11f0be07491e81440a108c061599468e2c2d2964 100644 (file)
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -287,10 +287,7 @@
 #define MUSB_FIFOSIZE          0x0F
 #define MUSB_CONFIGDATA                MUSB_FIFOSIZE   /* Re-used for EP0 */
 
-#if defined(CONFIG_USB_MUSB_TUSB6010) ||       \
-       defined(CONFIG_USB_MUSB_TUSB6010_MODULE)
 #include "tusb6010.h"          /* Needed "only" for TUSB_EP0_CONF */
-#endif
 
 #define MUSB_TXCSR_MODE                        0x2000