Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebf39920 authored by Tony Lindgren's avatar Tony Lindgren Committed by Felipe Balbi
Browse files

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: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 82c02f58

drivers/usb/musb/musb_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/usb/musb/musb_core.h

+3 −6
Original line number Diff line number Diff line
@@ -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;

drivers/usb/musb/musb_regs.h

+0 −3
Original line number Diff line number Diff line
@@ -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