From 312887fa39ecb1042fa042c96f83d8aba1a53391 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Thu, 23 Aug 2007 05:37:31 -0700 Subject: [PATCH] musb_hdrc: Some more cleanup Some more cleanup: - Primarily move from TRUE and FALSE to use "bool", "true", "false" - Some whitespace and longline cleanup Signed-off-by: David Brownell --- drivers/usb/musb/cppi_dma.c | 9 ++- drivers/usb/musb/cppi_dma.h | 11 ++- drivers/usb/musb/musb_core.c | 25 +++---- drivers/usb/musb/musb_core.h | 48 +++++-------- drivers/usb/musb/musb_dma.h | 4 +- drivers/usb/musb/musb_gadget.c | 28 +++----- drivers/usb/musb/musb_gadget_ep0.c | 17 ++--- drivers/usb/musb/musb_host.c | 66 ++++++++--------- drivers/usb/musb/musb_virthub.c | 28 ++++---- drivers/usb/musb/musbhsdma.c | 111 +++++++++++++++-------------- drivers/usb/musb/omap2430.h | 2 +- drivers/usb/musb/tusb6010_omap.c | 10 +-- 12 files changed, 168 insertions(+), 191 deletions(-) diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c index 5403a4f14e3..76e18997dcb 100644 --- a/drivers/usb/musb/cppi_dma.c +++ b/drivers/usb/musb/cppi_dma.c @@ -52,8 +52,7 @@ static inline void cpu_drain_writebuffer(void) #endif } -static inline struct cppi_descriptor * -cppi_bd_alloc(struct cppi_channel *c) +static inline struct cppi_descriptor *cppi_bd_alloc(struct cppi_channel *c) { struct cppi_descriptor *bd = c->bdPoolHead; @@ -147,11 +146,11 @@ static int __init cppi_controller_start(struct dma_controller *c) /* do whatever is necessary to start controller */ for (i = 0; i < ARRAY_SIZE(controller->txCppi); i++) { - controller->txCppi[i].transmit = TRUE; + controller->txCppi[i].transmit = true; controller->txCppi[i].chNo = i; } for (i = 0; i < ARRAY_SIZE(controller->rxCppi); i++) { - controller->rxCppi[i].transmit = FALSE; + controller->rxCppi[i].transmit = false; controller->rxCppi[i].chNo = i; } @@ -996,7 +995,7 @@ static int cppi_channel_program(struct dma_channel *pChannel, else cppi_next_rx_segment(musb, otgChannel, mode); - return TRUE; + return true; } static int cppi_rx_scan(struct cppi *cppi, unsigned ch) diff --git a/drivers/usb/musb/cppi_dma.h b/drivers/usb/musb/cppi_dma.h index 1d72c1b1acc..7e14badc3d8 100644 --- a/drivers/usb/musb/cppi_dma.h +++ b/drivers/usb/musb/cppi_dma.h @@ -33,10 +33,10 @@ struct cppi_descriptor { /* Hardware Overlay */ - u32 hNext; /**< Next(hardware) Buffer Descriptor Pointer */ - u32 buffPtr; /**lock, flags); if (musb->xceiv.state == OTG_STATE_B_WAIT_ACON) { - DBG(1, "HNP: B_WAIT_ACON timeout, going back to B_PERIPHERAL\n"); + DBG(1, "HNP: B_WAIT_ACON timeout; back to B_PERIPHERAL\n"); musb_g_disconnect(musb); musb->xceiv.state = OTG_STATE_B_PERIPHERAL; musb->is_active = 0; @@ -434,7 +434,8 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb, * not get a disconnect irq... */ if ((devctl & MUSB_DEVCTL_VBUS) - != (3 << MUSB_DEVCTL_VBUS_SHIFT)) { + != (3 << MUSB_DEVCTL_VBUS_SHIFT) + ) { musb->int_usb |= MUSB_INTR_DISCONNECT; musb->int_usb &= ~MUSB_INTR_SUSPEND; break; @@ -582,7 +583,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb, switch (musb->xceiv.state) { case OTG_STATE_B_PERIPHERAL: if (int_usb & MUSB_INTR_SUSPEND) { - DBG(1, "HNP: SUSPEND and CONNECT, now b_host\n"); + DBG(1, "HNP: SUSPEND+CONNECT, now b_host\n"); musb->xceiv.state = OTG_STATE_B_HOST; hcd->self.is_b_host = 1; int_usb &= ~MUSB_INTR_SUSPEND; @@ -615,14 +616,14 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb, /* * Looks like non-HS BABBLE can be ignored, but * HS BABBLE is an error condition. For HS the solution - * is to avoid babble in the first place and fix whatever - * causes BABBLE. When HS BABBLE happens we can only stop - * the session. + * is to avoid babble in the first place and fix what + * caused BABBLE. When HS BABBLE happens we can only + * stop the session. */ if (devctl & (MUSB_DEVCTL_FSDEV | MUSB_DEVCTL_LSDEV)) DBG(1, "BABBLE devctl: %02x\n", devctl); else { - ERR("Stopping host session because of babble\n"); + ERR("Stopping host session -- babble\n"); musb_writeb(mbase, MUSB_DEVCTL, 0); } } else if (is_peripheral_capable()) { @@ -1088,7 +1089,7 @@ fifo_setup(struct musb *musb, struct musb_hw_ep *hw_ep, hw_ep->tx_double_buffered = hw_ep->rx_double_buffered; hw_ep->max_packet_sz_tx = maxpacket; - hw_ep->is_shared_fifo = TRUE; + hw_ep->is_shared_fifo = true; break; } @@ -1214,11 +1215,11 @@ static int __init ep_config_from_hw(struct musb *musb) /* shared TX/RX FIFO? */ if ((reg & 0xf0) == 0xf0) { hw_ep->max_packet_sz_rx = hw_ep->max_packet_sz_tx; - hw_ep->is_shared_fifo = TRUE; + hw_ep->is_shared_fifo = true; continue; } else { hw_ep->max_packet_sz_rx = 1 << ((reg & 0xf0) >> 4); - hw_ep->is_shared_fifo = FALSE; + hw_ep->is_shared_fifo = false; } /* FIXME set up hw_ep->{rx,tx}_double_buffered */ @@ -1277,7 +1278,7 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb) if (reg & MUSB_CONFIGDATA_MPRXE) { strcat(aInfo, ", bulk combine"); #ifdef C_MP_RX - musb->bulk_combine = TRUE; + musb->bulk_combine = true; #else strcat(aInfo, " (X)"); /* no driver support */ #endif @@ -1285,7 +1286,7 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb) if (reg & MUSB_CONFIGDATA_MPTXE) { strcat(aInfo, ", bulk split"); #ifdef C_MP_TX - musb->bulk_split = TRUE; + musb->bulk_split = true; #else strcat(aInfo, " (X)"); /* no driver support */ #endif diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index d7364f0c4cd..dc56425fd1d 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -164,13 +164,6 @@ static inline void musb_host_rx(struct musb *m, u8 e) {} /****************************** CONSTANTS ********************************/ -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - #ifndef MUSB_C_NUM_EPS #define MUSB_C_NUM_EPS ((u8)16) #endif @@ -209,8 +202,8 @@ enum musb_g_ep0_state { * directly with the "flat" model, or after setting up an index register. */ -#if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_ARCH_OMAP2430) || \ - defined(CONFIG_ARCH_OMAP3430) +#if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_ARCH_OMAP2430) \ + || defined(CONFIG_ARCH_OMAP3430) /* REVISIT indexed access seemed to * misbehave (on DaVinci) for at least peripheral IN ... */ @@ -238,9 +231,9 @@ enum musb_g_ep0_state { /****************************** FUNCTIONS ********************************/ #define MUSB_HST_MODE(_musb)\ - { (_musb)->is_host=TRUE; } + { (_musb)->is_host = true; } #define MUSB_DEV_MODE(_musb) \ - { (_musb)->is_host=FALSE; } + { (_musb)->is_host = false; } #define test_devctl_hst_mode(_x) \ (musb_readb((_x)->mregs, MUSB_DEVCTL)&MUSB_DEVCTL_HM) @@ -267,9 +260,9 @@ struct musb_hw_ep { u8 epnum; /* hardware configuration, possibly dynamic */ - u8 is_shared_fifo; - u8 tx_double_buffered; - u8 rx_double_buffered; + bool is_shared_fifo; + bool tx_double_buffered; + bool rx_double_buffered; u16 max_packet_sz_tx; u16 max_packet_sz_rx; @@ -393,11 +386,12 @@ struct musb { u8 min_power; /* vbus for periph, in mA/2 */ + bool is_host; + /* active means connected and not suspended */ unsigned is_active:1; unsigned is_multipoint:1; - unsigned is_host:1; unsigned ignore_disconnect:1; /* during bus resets */ int a_wait_bcon; /* VBUS timeout in msecs */ @@ -413,16 +407,11 @@ struct musb { #ifdef C_MP_RX unsigned bulk_combine:1; - /* REVISIT allegedly doesn't work reliably */ -#if 0 #define can_bulk_combine(musb,type) \ (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine) #else #define can_bulk_combine(musb,type) 0 #endif -#else -#define can_bulk_combine(musb,type) 0 -#endif #ifdef CONFIG_USB_GADGET_MUSB_HDRC /* is_suspended means USB B_PERIPHERAL suspend */ @@ -438,9 +427,9 @@ struct musb { unsigned is_self_powered:1; unsigned is_bus_powered:1; - unsigned set_address:1; - unsigned test_mode:1; - unsigned softconnect:1; + unsigned set_address:1; + unsigned test_mode:1; + unsigned softconnect:1; enum musb_g_ep0_state ep0_state; u8 address; @@ -475,10 +464,8 @@ extern const char musb_driver_name[]; extern void musb_start(struct musb *musb); extern void musb_stop(struct musb *musb); -extern void musb_write_fifo(struct musb_hw_ep *ep, - u16 len, const u8 * src); -extern void musb_read_fifo(struct musb_hw_ep *ep, - u16 len, u8 * dst); +extern void musb_write_fifo(struct musb_hw_ep *ep, u16 len, const u8 * src); +extern void musb_read_fifo(struct musb_hw_ep *ep, u16 len, u8 * dst); extern void musb_load_testpacket(struct musb *); @@ -507,13 +494,12 @@ extern int musb_platform_exit(struct musb *musb); struct proc_dir_entry; #if (MUSB_DEBUG > 0) && defined(MUSB_CONFIG_PROC_FS) -extern struct proc_dir_entry *musb_debug_create(char *name, - struct musb *data); +extern struct proc_dir_entry *musb_debug_create(char *name, struct musb *data); extern void musb_debug_delete(char *name, struct musb *data); #else -static inline struct proc_dir_entry *musb_debug_create(char *name, - struct musb *data) +static inline struct proc_dir_entry * +musb_debug_create(char *name, struct musb *data) { return NULL; } diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h index 74e38ec6931..80027c721a2 100644 --- a/drivers/usb/musb/musb_dma.h +++ b/drivers/usb/musb/musb_dma.h @@ -106,7 +106,7 @@ struct dma_controller; * transaction (typically representing many USB maximum-sized packets) * @actual_len: how many bytes have been transferred * @status: current channel status (updated e.g. on interrupt) - * @desired_mode: TRUE if mode 1 is desired; FALSE if mode 0 is desired + * @desired_mode: true if mode 1 is desired; false if mode 0 is desired * * channels are associated with an endpoint for the duration of at least * one usb transfer. @@ -117,7 +117,7 @@ struct dma_channel { size_t max_len; size_t actual_len; enum dma_channel_status status; - u8 desired_mode; + bool desired_mode; }; /* diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 40c2283a3e6..c724057e139 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -102,7 +102,7 @@ Handling completion void musb_g_giveback( struct musb_ep *ep, struct usb_request *request, - int status) + int status) __releases(ep->musb->lock) __acquires(ep->musb->lock) { @@ -524,7 +524,7 @@ void musb_g_tx(struct musb *musb, u8 epnum) : NULL; if (!request) { DBG(4, "%s idle now\n", - musb_ep->end_point.name); + musb_ep->end_point.name); break; } } @@ -635,7 +635,7 @@ static void rxstate(struct musb *musb, struct musb_request *req) * that last pckate should trigger an overflow fault.) But in mode 1, * we don't get DMA completion interrrupt for short packets. * - * Theoretically, we could enable DMAReq interrupt (MUSB_RXCSR_DMAMODE = 1), + * Theoretically, we could enable DMAReq irq (MUSB_RXCSR_DMAMODE = 1), * to get endpoint interrupt on every DMA req, but that didn't seem * to work reliably. * @@ -649,14 +649,13 @@ static void rxstate(struct musb *musb, struct musb_request *req) // csr |= MUSB_RXCSR_DMAMODE; /* this special sequence (enabling and then - disabling MUSB_RXCSR_DMAMODE) is required - to get DMAReq to activate + * disabling MUSB_RXCSR_DMAMODE) is required + * to get DMAReq to activate */ musb_writew(epio, MUSB_RXCSR, csr | MUSB_RXCSR_DMAMODE); #endif - musb_writew(epio, MUSB_RXCSR, - csr); + musb_writew(epio, MUSB_RXCSR, csr); if (request->actual < request->length) { int transfer_size = 0; @@ -683,7 +682,7 @@ static void rxstate(struct musb *musb, struct musb_request *req) if (use_dma) return; } -#endif /* Mentor's USB */ +#endif /* Mentor's DMA */ fifo_count = request->length - request->actual; DBG(3, "%s OUT/RX pio fifo %d/%d, maxpacket %d\n", @@ -705,7 +704,7 @@ static void rxstate(struct musb *musb, struct musb_request *req) channel->desired_mode, dma_addr, fifo_count); - if (ret == TRUE) + if (ret) return; } #endif @@ -1492,14 +1491,6 @@ static int musb_gadget_vbus_session(struct usb_gadget *gadget, int is_active) return -EINVAL; } - -static int musb_gadget_vbus_draw(struct usb_gadget *gadget, unsigned mA) -{ - /* FIXME -- delegate to otg_transciever logic */ - - DBG(2, "<= vbus_draw %u =>\n", mA); - return 0; -} #endif static int musb_gadget_vbus_draw(struct usb_gadget *gadget, unsigned mA) @@ -1775,8 +1766,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) } EXPORT_SYMBOL(usb_gadget_register_driver); -static void -stop_activity(struct musb *musb, struct usb_gadget_driver *driver) +static void stop_activity(struct musb *musb, struct usb_gadget_driver *driver) { int i; struct musb_hw_ep *hw_ep; diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c index 2395729f61c..51cb737fc68 100644 --- a/drivers/usb/musb/musb_gadget_ep0.c +++ b/drivers/usb/musb/musb_gadget_ep0.c @@ -170,8 +170,7 @@ static int service_tx_status_request( * Context: caller holds controller lock */ static int -service_in_request(struct musb *musb, - const struct usb_ctrlrequest *ctrlrequest) +service_in_request(struct musb *musb, const struct usb_ctrlrequest *ctrlrequest) { int handled = 0; /* not handled */ @@ -240,7 +239,7 @@ __acquires(musb->lock) switch (ctrlrequest->bRequest) { case USB_REQ_SET_ADDRESS: /* change it after the status stage */ - musb->set_address = TRUE; + musb->set_address = true; musb->address = (u8) (ctrlrequest->wValue & 0x7f); handled = 1; break; @@ -334,7 +333,7 @@ __acquires(musb->lock) /* enter test mode after irq */ if (handled > 0) - musb->test_mode = TRUE; + musb->test_mode = true; break; #ifdef CONFIG_USB_MUSB_OTG case USB_DEVICE_B_HNP_ENABLE: @@ -560,7 +559,7 @@ musb_read_setup(struct musb *musb, struct usb_ctrlrequest *req) * the TX FIFO right away, and give the controller a moment * to switch modes... */ - musb->set_address = FALSE; + musb->set_address = false; musb->ackpend = MUSB_CSR0_P_SVDRXPKTRDY; if (req->wLength == 0) { if (req->bRequestType & USB_DIR_IN) @@ -578,8 +577,7 @@ musb_read_setup(struct musb *musb, struct usb_ctrlrequest *req) } static int -forward_to_driver(struct musb *musb, - const struct usb_ctrlrequest *ctrlrequest) +forward_to_driver(struct musb *musb, const struct usb_ctrlrequest *ctrlrequest) __releases(musb->lock) __acquires(musb->lock) { @@ -663,7 +661,7 @@ irqreturn_t musb_g_ep0_irq(struct musb *musb) * is done we won't see the next packet. */ if (musb->set_address) { - musb->set_address = FALSE; + musb->set_address = false; musb_writeb(mbase, MUSB_FADDR, musb->address); } @@ -897,8 +895,7 @@ cleanup: return status; } -static int -musb_g_ep0_dequeue(struct usb_ep *ep, struct usb_request *req) +static int musb_g_ep0_dequeue(struct usb_ep *ep, struct usb_request *req) { /* we just won't support this */ return -EINVAL; diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index e7935fb4c4d..3af31b7e81c 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -311,7 +311,8 @@ __acquires(musb->lock) } /* for bulk/interrupt endpoints only */ -static inline void musb_save_toggle(struct musb_hw_ep *ep, int is_in, struct urb *urb) +static inline void +musb_save_toggle(struct musb_hw_ep *ep, int is_in, struct urb *urb) { struct usb_device *udev = urb->dev; u16 csr; @@ -466,13 +467,13 @@ static inline u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr) /* * PIO RX for a packet (or part of it). */ -static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb, - u8 epnum, u8 iso_err) +static bool +musb_host_packet_rx(struct musb *musb, struct urb *urb, u8 epnum, u8 iso_err) { - u16 rx_count; - u8 *buf; - u16 csr; - u8 done = FALSE; + u16 rx_count; + u8 *buf; + u16 csr; + bool done = false; u32 length; int do_flush = 0; struct musb_hw_ep *hw_ep = musb->endpoints + epnum; @@ -940,14 +941,13 @@ static void musb_ep_program(struct musb *musb, u8 epnum, /* * Service the default endpoint (ep0) as host. - * Return TRUE until it's time to start the status stage. + * Return true until it's time to start the status stage. */ -static int musb_h_ep0_continue(struct musb *musb, - u16 len, struct urb *urb) +static bool musb_h_ep0_continue(struct musb *musb, u16 len, struct urb *urb) { - int more = FALSE; - u8 *fifo_dest = NULL; - u16 fifo_count = 0; + bool more = false; + u8 *fifo_dest = NULL; + u16 fifo_count = 0; struct musb_hw_ep *hw_ep = musb->control_ep; struct musb_qh *qh = hw_ep->in_qh; struct usb_ctrlrequest *request; @@ -969,7 +969,7 @@ static int musb_h_ep0_continue(struct musb *musb, */ } else if (urb->actual_length < urb->transfer_buffer_length) - more = TRUE; + more = true; break; case MUSB_EP0_START: request = (struct usb_ctrlrequest *) urb->setup_packet; @@ -980,12 +980,12 @@ static int musb_h_ep0_continue(struct musb *musb, } else if (request->bRequestType & USB_DIR_IN) { DBG(4, "start IN-DATA\n"); musb->ep0_stage = MUSB_EP0_IN; - more = TRUE; + more = true; break; } else { DBG(4, "start OUT-DATA\n"); musb->ep0_stage = MUSB_EP0_OUT; - more = TRUE; + more = true; } /* FALLTHROUGH */ case MUSB_EP0_OUT: @@ -1001,7 +1001,7 @@ static int musb_h_ep0_continue(struct musb *musb, musb_write_fifo(hw_ep, fifo_count, fifo_dest); urb->actual_length += fifo_count; - more = TRUE; + more = true; } break; default: @@ -1027,7 +1027,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb) struct musb_hw_ep *hw_ep = musb->control_ep; void __iomem *epio = hw_ep->regs; struct musb_qh *qh = hw_ep->in_qh; - u8 complete = FALSE; + bool complete = false; irqreturn_t retval = IRQ_NONE; /* ep0 only has one queue, "in" */ @@ -1045,7 +1045,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb) /* if we just did status stage, we are done */ if (MUSB_EP0_STATUS == musb->ep0_stage) { retval = IRQ_HANDLED; - complete = TRUE; + complete = true; } /* prepare status */ @@ -1076,7 +1076,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb) retval = IRQ_HANDLED; if (urb) urb->status = status; - complete = TRUE; + complete = true; /* use the proper sequence to abort the transfer */ if (csr & MUSB_CSR0_H_REQPKT) { @@ -1165,7 +1165,7 @@ done: void musb_host_tx(struct musb *musb, u8 epnum) { int pipe; - u8 done = FALSE; + bool done = false; u16 tx_csr; size_t wLength = 0; u8 *buf = NULL; @@ -1247,7 +1247,7 @@ void musb_host_tx(struct musb *musb, u8 epnum) musb_writew(epio, MUSB_TXCSR, tx_csr); musb_writeb(epio, MUSB_TXINTERVAL, 0); - done = TRUE; + done = true; } /* second cppi case */ @@ -1271,22 +1271,22 @@ void musb_host_tx(struct musb *musb, u8 epnum) d = urb->iso_frame_desc + qh->iso_idx; d->actual_length = qh->segsize; if (++qh->iso_idx >= urb->number_of_packets) { - done = TRUE; + done = true; } else if (!dma) { d++; buf = urb->transfer_buffer + d->offset; wLength = d->length; } } else if (dma) { - done = TRUE; + done = true; } else { /* see if we need to send more data, or ZLP */ if (qh->segsize < qh->maxpacket) - done = TRUE; + done = true; else if (qh->offset == urb->transfer_buffer_length && !(urb-> transfer_flags & URB_ZERO_PACKET)) - done = TRUE; + done = true; if (!done) { buf = urb->transfer_buffer + qh->offset; @@ -1300,7 +1300,7 @@ void musb_host_tx(struct musb *musb, u8 epnum) * so we must abort this transfer after cleanup */ if (urb->status != -EINPROGRESS) { - done = TRUE; + done = true; if (status == 0) status = urb->status; } @@ -1387,8 +1387,8 @@ void musb_host_rx(struct musb *musb, u8 epnum) void __iomem *mbase = musb->mregs; int pipe; u16 rx_csr, val; - u8 iso_err = FALSE; - u8 done = FALSE; + bool iso_err = false; + bool done = false; u32 status; struct dma_channel *dma; @@ -1452,7 +1452,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) } else { DBG(4, "RX end %d ISO data error\n", epnum); /* packet error reported later */ - iso_err = TRUE; + iso_err = true; } } @@ -1466,7 +1466,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) } musb_h_flush_rxfifo(hw_ep, 0); musb_writeb(epio, MUSB_RXINTERVAL, 0); - done = TRUE; + done = true; goto finish; } @@ -1494,7 +1494,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) dma->status = MUSB_DMA_STATUS_CORE_ABORT; (void) musb->dma_controller->channel_abort(dma); xfer_len = dma->actual_len; - done = TRUE; + done = true; } DBG(2, "RXCSR%d %04x, reqpkt, len %zd%s\n", epnum, rx_csr, @@ -1533,7 +1533,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) musb_readw(epio, MUSB_RXCSR), musb_readw(epio, MUSB_RXCOUNT)); #else - done = TRUE; + done = true; #endif } else if (urb->status == -EINPROGRESS) { /* if no errors, be sure a packet is ready for unloading */ diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c index 94228812d7c..618d8a55816 100644 --- a/drivers/usb/musb/musb_virthub.c +++ b/drivers/usb/musb/musb_virthub.c @@ -46,7 +46,7 @@ #include "musb_core.h" -static void musb_port_suspend(struct musb *musb, u8 bSuspend) +static void musb_port_suspend(struct musb *musb, bool do_suspend) { u8 power; void __iomem *mbase = musb->mregs; @@ -60,7 +60,7 @@ static void musb_port_suspend(struct musb *musb, u8 bSuspend) * SE0 changing to connect (J) or wakeup (K) states. */ power = musb_readb(mbase, MUSB_POWER); - if (bSuspend) { + if (do_suspend) { int retries = 10000; power &= ~MUSB_POWER_RESUME; @@ -110,14 +110,14 @@ static void musb_port_suspend(struct musb *musb, u8 bSuspend) } } -static void musb_port_reset(struct musb *musb, u8 bReset) +static void musb_port_reset(struct musb *musb, bool do_reset) { u8 power; void __iomem *mbase = musb->mregs; #ifdef CONFIG_USB_MUSB_OTG if (musb->xceiv.state == OTG_STATE_B_IDLE) { - DBG(2, "HNP: Returning from HNP, not resetting hub as b_idle\n"); + DBG(2, "HNP: Returning from HNP; no hub reset from b_idle\n"); musb->port1_status &= ~USB_PORT_STAT_RESET; return; } @@ -130,7 +130,7 @@ static void musb_port_reset(struct musb *musb, u8 bReset) * the appropriate amount of time has passed */ power = musb_readb(mbase, MUSB_POWER); - if (bReset) { + if (do_reset) { /* * If RESUME is set, we must make sure it stays minimum 20 ms. @@ -147,7 +147,7 @@ static void musb_port_reset(struct musb *musb, u8 bReset) msleep(1); } - musb->ignore_disconnect = TRUE; + musb->ignore_disconnect = true; power &= 0xf0; musb_writeb(mbase, MUSB_POWER, power | MUSB_POWER_RESET); @@ -160,7 +160,7 @@ static void musb_port_reset(struct musb *musb, u8 bReset) musb_writeb(mbase, MUSB_POWER, power & ~MUSB_POWER_RESET); - musb->ignore_disconnect = FALSE; + musb->ignore_disconnect = false; power = musb_readb(mbase, MUSB_POWER); if (power & MUSB_POWER_HSMODE) { @@ -255,7 +255,7 @@ int musb_hub_control( case USB_PORT_FEAT_ENABLE: break; case USB_PORT_FEAT_SUSPEND: - musb_port_suspend(musb, FALSE); + musb_port_suspend(musb, false); break; case USB_PORT_FEAT_POWER: if (!(is_otg_enabled(musb) && hcd->self.is_b_host)) @@ -303,7 +303,7 @@ int musb_hub_control( /* finish RESET signaling? */ if ((musb->port1_status & USB_PORT_STAT_RESET) && time_after(jiffies, musb->rh_timer)) - musb_port_reset(musb, FALSE); + musb_port_reset(musb, false); /* finish RESUME signaling? */ if ((musb->port1_status & MUSB_PORT_STAT_RESUME) @@ -330,7 +330,8 @@ int musb_hub_control( musb->xceiv.state = OTG_STATE_A_HOST; } - put_unaligned(cpu_to_le32(musb->port1_status & ~MUSB_PORT_STAT_RESUME), + put_unaligned(cpu_to_le32(musb->port1_status + & ~MUSB_PORT_STAT_RESUME), (__le32 *) buf); /* port change status is more interesting */ @@ -357,10 +358,10 @@ int musb_hub_control( musb_start(musb); break; case USB_PORT_FEAT_RESET: - musb_port_reset(musb, TRUE); + musb_port_reset(musb, true); break; case USB_PORT_FEAT_SUSPEND: - musb_port_suspend(musb, TRUE); + musb_port_suspend(musb, true); break; case USB_PORT_FEAT_TEST: if (unlikely(is_host_active(musb))) @@ -390,7 +391,8 @@ int musb_hub_control( temp = MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_HS; - musb_writeb(musb->mregs, MUSB_DEVCTL, MUSB_DEVCTL_SESSION); + musb_writeb(musb->mregs, MUSB_DEVCTL, + MUSB_DEVCTL_SESSION); break; case 6: pr_debug("TEST_FIFO_ACCESS\n"); diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c index 974fd7d0890..71690e52df1 100644 --- a/drivers/usb/musb/musbhsdma.c +++ b/drivers/usb/musb/musbhsdma.c @@ -85,10 +85,10 @@ struct musb_dma_channel { struct musb_dma_controller { struct dma_controller Controller; struct musb_dma_channel aChannel[MUSB_HSDMA_CHANNELS]; - void *pDmaPrivate; - void __iomem *pCoreBase; - u8 bChannelCount; - u8 bmUsedChannels; + void *pDmaPrivate; + void __iomem *pCoreBase; + u8 bChannelCount; + u8 bmUsedChannels; u8 irq; }; @@ -114,7 +114,7 @@ static int dma_controller_stop(struct dma_controller *c) for (bBit = 0; bBit < MUSB_HSDMA_CHANNELS; bBit++) { if (controller->bmUsedChannels & (1 << bBit)) { - pChannel = &(controller->aChannel[bBit].Channel); + pChannel = &controller->aChannel[bBit].Channel; dma_channel_release(pChannel); if (!controller->bmUsedChannels) @@ -125,7 +125,7 @@ static int dma_controller_stop(struct dma_controller *c) return 0; } -static struct dma_channel* dma_channel_allocate(struct dma_controller *c, +static struct dma_channel *dma_channel_allocate(struct dma_controller *c, struct musb_hw_ep *hw_ep, u8 transmit) { u8 bBit; @@ -182,42 +182,43 @@ static void configure_channel(struct dma_channel *pChannel, u16 csr = 0; DBG(4, "%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n", - pChannel, packet_sz, dma_addr, len, mode); + pChannel, packet_sz, dma_addr, len, mode); if (mode) { csr |= 1 << MUSB_HSDMA_MODE1_SHIFT; - if (len < packet_sz) { - return FALSE; - } + BUG_ON(len < packet_sz); + if (packet_sz >= 64) { - csr |= - MUSB_HSDMA_BURSTMODE_INCR16 << MUSB_HSDMA_BURSTMODE_SHIFT; + csr |= MUSB_HSDMA_BURSTMODE_INCR16 + << MUSB_HSDMA_BURSTMODE_SHIFT; } else if (packet_sz >= 32) { - csr |= - MUSB_HSDMA_BURSTMODE_INCR8 << MUSB_HSDMA_BURSTMODE_SHIFT; + csr |= MUSB_HSDMA_BURSTMODE_INCR8 + << MUSB_HSDMA_BURSTMODE_SHIFT; } else if (packet_sz >= 16) { - csr |= - MUSB_HSDMA_BURSTMODE_INCR4 << MUSB_HSDMA_BURSTMODE_SHIFT; + csr |= MUSB_HSDMA_BURSTMODE_INCR4 + << MUSB_HSDMA_BURSTMODE_SHIFT; } } csr |= (pImplChannel->epnum << MUSB_HSDMA_ENDPOINT_SHIFT) | (1 << MUSB_HSDMA_ENABLE_SHIFT) | (1 << MUSB_HSDMA_IRQENABLE_SHIFT) - | (pImplChannel->transmit ? (1 << MUSB_HSDMA_TRANSMIT_SHIFT) : 0); + | (pImplChannel->transmit + ? (1 << MUSB_HSDMA_TRANSMIT_SHIFT) + : 0); /* address/count */ musb_writel(mbase, - MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS), - dma_addr); + MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS), + dma_addr); musb_writel(mbase, - MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT), - len); + MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT), + len); /* control (this should start things) */ musb_writew(mbase, - MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL), - csr); + MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL), + csr); } static int dma_channel_program(struct dma_channel * pChannel, @@ -241,14 +242,12 @@ static int dma_channel_program(struct dma_channel * pChannel, pImplChannel->wMaxPacketSize = packet_sz; pChannel->status = MUSB_DMA_STATUS_BUSY; - if ((mode == 1) && (len >= packet_sz)) { - configure_channel(pChannel, packet_sz, 1, dma_addr, - len); - } else - configure_channel(pChannel, packet_sz, 0, dma_addr, - len); + if ((mode == 1) && (len >= packet_sz)) + configure_channel(pChannel, packet_sz, 1, dma_addr, len); + else + configure_channel(pChannel, packet_sz, 0, dma_addr, len); - return TRUE; + return true; } static int dma_channel_abort(struct dma_channel *pChannel) @@ -268,8 +267,8 @@ static int dma_channel_abort(struct dma_channel *pChannel) MUSB_TXCSR_DMAENAB | MUSB_TXCSR_DMAMODE); musb_writew(mbase, - MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR), - csr); + MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR), + csr); } else { csr = musb_readw(mbase, @@ -278,16 +277,19 @@ static int dma_channel_abort(struct dma_channel *pChannel) MUSB_RXCSR_DMAENAB | MUSB_RXCSR_DMAMODE); musb_writew(mbase, - MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_RXCSR), - csr); + MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_RXCSR), + csr); } musb_writew(mbase, - MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL), 0); + MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL), + 0); musb_writel(mbase, - MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS), 0); + MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS), + 0); musb_writel(mbase, - MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT), 0); + MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT), + 0); pChannel->status = MUSB_DMA_STATUS_FREE; } @@ -318,26 +320,26 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) pChannel = &pImplChannel->Channel; csr = musb_readw(mbase, - MUSB_HSDMA_CHANNEL_OFFSET(bChannel, + MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL)); - if (csr & (1 << MUSB_HSDMA_BUSERROR_SHIFT)) { + if (csr & (1 << MUSB_HSDMA_BUSERROR_SHIFT)) pImplChannel->Channel.status = - MUSB_DMA_STATUS_BUS_ABORT; - } else { + MUSB_DMA_STATUS_BUS_ABORT; + else { dwAddress = musb_readl(mbase, MUSB_HSDMA_CHANNEL_OFFSET( bChannel, MUSB_HSDMA_ADDRESS)); - pChannel->actual_len = - dwAddress - pImplChannel->dwStartAddress; + pChannel->actual_len = dwAddress + - pImplChannel->dwStartAddress; DBG(2, "ch %p, 0x%x -> 0x%x (%d / %d) %s\n", - pChannel, pImplChannel->dwStartAddress, - dwAddress, pChannel->actual_len, - pImplChannel->len, - (pChannel->actual_len < - pImplChannel->len) ? + pChannel, pImplChannel->dwStartAddress, + dwAddress, pChannel->actual_len, + pImplChannel->len, + (pChannel->actual_len + < pImplChannel->len) ? "=> reconfig 0": "=> complete"); u8 devctl = musb_readb(mbase, @@ -347,16 +349,17 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) /* completed */ if ((devctl & MUSB_DEVCTL_HM) - && (pImplChannel->transmit) - && ((pChannel->desired_mode == 0) - || (pChannel->actual_len & + && (pImplChannel->transmit) + && ((pChannel->desired_mode == 0) + || (pChannel->actual_len & (pImplChannel->wMaxPacketSize - 1))) - ) { + ) { /* Send out the packet */ musb_ep_select(mbase, pImplChannel->epnum); - musb_writew(mbase, - MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR), + musb_writew(mbase, MUSB_EP_OFFSET( + pImplChannel->epnum, + MUSB_TXCSR), MUSB_TXCSR_TXPKTRDY); } else musb_dma_completion( diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h index 3ce7be174f5..758356eeb94 100644 --- a/drivers/usb/musb/omap2430.h +++ b/drivers/usb/musb/omap2430.h @@ -45,7 +45,7 @@ # define UTMI_8BIT (0 << PHYSEL) # define ULPI_12PIN (1 << PHYSEL) # define ULPI_8PIN (2 << PHYSEL) -#define OTG_SIMENABLE_REG OMAP_HSOTG(0x10) +#define OTG_SIMENABLE_REG OMAP_HSOTG(0x10) # define TM1 (1 << 0) #define OTG_FORCESTDBY_REG OMAP_HSOTG(0x14) # define ENABLEFORCE (1 << 0) diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index c7fbfba66e2..84192a8f26a 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c @@ -251,7 +251,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, s8 sync_dev; if (unlikely(dma_addr & 0x1) || (len < 32) || (len > packet_sz)) - return FALSE; + return false; /* * HW issue #10: Async dma will eventually corrupt the XFR_SIZE @@ -260,7 +260,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, * register is corrupt, and we won't know if the DMA worked. */ if (dma_addr & 0x2) - return FALSE; + return false; chdat->transfer_len = len & ~0x1f; @@ -276,14 +276,14 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, } else { if (tusb_omap_use_shared_dmareq(chdat) != 0) { DBG(3, "could not get dma for ep%i\n", chdat->epnum); - return FALSE; + return false; } if (tusb_dma->ch < 0) { /* REVISIT: This should get blocked earlier, happens * with MSC ErrorRecoveryTest */ WARN_ON(1); - return FALSE; + return false; } ch = tusb_dma->ch; @@ -411,7 +411,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, TUSB_EP_CONFIG_XFR_SIZE(chdat->transfer_len)); } - return TRUE; + return true; } static int tusb_omap_dma_abort(struct dma_channel *channel) -- 2.41.1