Fix coding style of staging/octeon-usb/octeon-hcd.c
cover Fix coding style of staging/octeon-usb/octeon-hcd.c
This patch fixes some coding styles issues with staging/octeon-usb/octeon-hcd.c.
Paul Davies C (3):
Add blank line after all declarations in
staging/octeon-usb/octeon-hcd.c
Enclose complex macro with paranthese in
staging/octeon-usb/octeon-hcd.c
Fix lines with more than 80 chars in staging/octeon-usb/octeon-hcd.c
drivers/staging/octeon-usb/octeon-hcd.c | 110 +++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 26 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/3 Add blank line after all declarations in staging/octeon-usb/octeon-hcd.c
Blank lines are added after each declaration in the file.
--- drivers/staging/octeon-usb/octeon-hcd.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/staging/octeon-usb/octeon-hcd.c +17 -2
@@ -892,6 +892,7 @@ static int cvmx_usb_initialize(struct cvmx_usb_state *usb,*/ {union cvmx_usbcx_gusbcfg usbcx_gusbcfg; + usbcx_gusbcfg.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_GUSBCFG (usb->index)); usbcx_gusbcfg.s.toutcal =0 ;
@@ -949,6 +950,7 @@ static int cvmx_usb_initialize(struct cvmx_usb_state *usb,*/ {union cvmx_usbcx_hcfg usbcx_hcfg; + usbcx_hcfg.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_HCFG (usb->index)); usbcx_hcfg.s.fslssupp =0 ;
@@ -1076,6 +1078,7 @@ static int cvmx_usb_enable(struct cvmx_usb_state *usb)*/ {union cvmx_usbcx_gnptxfsiz siz; + siz.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_GNPTXFSIZ (usb->index)); siz.s.nptxfdep = usbcx_ghwcfg3.s.dfifodepth /2 ;
@@ -1090,6 +1093,7 @@ static int cvmx_usb_enable(struct cvmx_usb_state *usb)*/ {union cvmx_usbcx_hptxfsiz siz; + siz.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_HPTXFSIZ (usb->index)); siz.s.ptxfsize = usbcx_ghwcfg3.s.dfifodepth /4 ;
@@ -1219,8 +1223,8 @@ static struct cvmx_usb_port_status cvmx_usb_get_status(* Returns: A non-NULL value is a pipe. NULL means an error. */ static struct cvmx_usb_pipe *cvmx_usb_open_pipe(struct cvmx_usb_state *usb, - int device_addr, int - endpoint_num, + int device_addr, + int endpoint_num, enum cvmx_usb_speed device_speed, int max_packet,
@@ -1423,6 +1427,7 @@ static void __cvmx_usb_poll_tx_fifo(struct cvmx_usb_state *usb) {if (usb->periodic.head != usb->periodic.tail) {union cvmx_usbcx_hptxsts tx_status; + tx_status.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_HPTXSTS (usb->index)); if (__cvmx_usb_fill_tx_hw(usb, &usb->periodic,
@@ -1438,6 +1443,7 @@ static void __cvmx_usb_poll_tx_fifo(struct cvmx_usb_state *usb)if (usb->nonperiodic.head != usb->nonperiodic.tail) {union cvmx_usbcx_gnptxsts tx_status; + tx_status.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_GNPTXSTS (usb->index)); if (__cvmx_usb_fill_tx_hw(usb, &usb->nonperiodic,
@@ -1722,6 +1728,7 @@ static void __cvmx_usb_start_channel(struct cvmx_usb_state *usb,/* Setup the locations the DMA engines use */ {uint64_t dma_address = transaction->buffer + transaction->actual_bytes; +if (transaction->type ==CVMX_USB_TRANSFER_ISOCHRONOUS ) dma_address = transaction->buffer + transaction->iso_packets[0 ].offset + transaction->actual_bytes;__cvmx_usb_write_csr64 (usb,CVMX_USBNX_DMA0_OUTB_CHN0 (usb->index) + channel*8 , dma_address);
@@ -2038,6 +2045,7 @@ static void __cvmx_usb_schedule(struct cvmx_usb_state *usb, int is_sof)*/ union cvmx_usbcx_hfnum hfnum = {.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_HFNUM (usb->index))};union cvmx_usbcx_hfir hfir = {.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_HFIR (usb->index))}; +if (hfnum.s.frrem < hfir.s.frint/4 ) goto done; }
@@ -2522,6 +2530,7 @@ static int cvmx_usb_cancel_all(struct cvmx_usb_state *usb,/* Simply loop through and attempt to cancel each transaction */ list_for_each_entry_safe (transaction, next, &pipe->transactions, node) {int result =cvmx_usb_cancel (usb, pipe, transaction); +if (unlikely (result !=0 ))return result; }
@@ -3083,6 +3092,7 @@ static int __cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) pipe->interval; }else {struct cvmx_usb_port_status port; + port =cvmx_usb_get_status (usb);if (port.port_enabled) {/* We'll retry the exact same transaction again */
@@ -3196,6 +3206,7 @@ static int cvmx_usb_poll(struct cvmx_usb_state *usb)* to clear this bit. */ union cvmx_usbcx_haint usbc_haint; + usbc_haint.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_HAINT (usb->index));while (usbc_haint.u32) {int channel;
@@ -3267,6 +3278,7 @@ static int octeon_usb_urb_enqueue(struct usb_hcd *hcd,enum cvmx_usb_speed speed;int split_device =0 ;int split_port =0 ; +switch (usb_pipetype (urb->pipe)) {case PIPE_ISOCHRONOUS : transfer_type =CVMX_USB_TRANSFER_ISOCHRONOUS ;
@@ -3303,6 +3315,7 @@ static int octeon_usb_urb_enqueue(struct usb_hcd *hcd,* tree. */ struct usb_device *dev = urb->dev; +while (dev->parent) {/* * If our parent is high speed then he'll
@@ -3462,6 +3475,7 @@ static void octeon_usb_endpoint_disable(struct usb_hcd *hcd,struct octeon_hcd *priv =hcd_to_octeon (hcd);struct cvmx_usb_pipe *pipe = ep->hcpriv;unsigned long flags; +spin_lock_irqsave (&priv->lock, flags);cvmx_usb_cancel_all (&priv->usb, pipe);if (cvmx_usb_close_pipe (&priv->usb, pipe))
@@ -3778,6 +3792,7 @@ static int octeon_usb_probe(struct platform_device *pdev)if (irq <0 ) {/* Defective device tree, but we know how to fix it. */ irq_hw_number_t hwirq = usb_num ? (1 <<6 ) +17 :56 ; + irq =irq_create_mapping (NULL , hwirq); }
Signature · 1 line
1.7.9.5
PATCH 2/3 Enclose complex macro with parantheses in staging/octeon-usb/octeon-hcd.c
In reply to Paul Davies CComplex macro is enlosed with parantheses.
--- drivers/staging/octeon-usb/octeon-hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/octeon-usb/octeon-hcd.c +1 -1
@@ -246,7 +246,7 @@ enum cvmx_usb_pipe_flags { };/* Normal prefetch that use the pref instruction. */ -#define CVMX_PREFETCH (address, offset) asm volatile ("pref %[type], %[off](%[rbase])" : : [rbase] "d" (address), [off] "I" (offset), [type] "n" (0)) +#define CVMX_PREFETCH (address, offset) (asm volatile ("pref %[type], %[off](%[rbase])" : : [rbase] "d" (address), [off] "I" (offset), [type] "n" (0)))/* Maximum number of times to retry failed transactions */ #define MAX_RETRIES 3
Signature · 1 line
1.7.9.5
Re: [PATCH 2/3] Enclose complex macro with parantheses in staging/octeon-usb/octeon-hcd.c
Hi,
Quoted 1 line · Paul Davies C
Complex macro is enlosed with parantheses.
This patch breaks compilation. I'll send patches to remove the whole macro.
A.
Re: [PATCH 2/3] Enclose complex macro with parantheses in staging/octeon-usb/octeon-hcd.c
Quoted 7 lines · Aaro Koskinen
Hi,
Quoted 1 line · Paul Davies C
Complex macro is enlosed with parantheses.
This patch breaks compilation. I'll send patches to remove the whole macro.
A.
I hope everything else is ok with you. I will drop PATCH 2/3 and resubmit it.
Signature · 3 lines
Paul Davies C, CSE B.Tech. student, Govt. Engineering College, Thrissur.
PATCH 3/3 Fix lines with more than 80 chars in staging/octeon-usb/octeon-hcd.c
In reply to Paul Davies CLines with more than 80 characters are converted in to multiple lines.
--- drivers/staging/octeon-usb/octeon-hcd.c | 89 +++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 23 deletions(-)
drivers/staging/octeon-usb/octeon-hcd.c +66 -23
@@ -462,7 +462,8 @@ struct octeon_hcd { }while (0 )/* Returns the IO address to push/pop stuff data from the FIFOs */ -#define USB_FIFO_ADDRESS(channel, usb_index) (CVMX_USBCX_GOTGCTL(usb_index) + ((channel)+1)*0x1000) +#define USB_FIFO_ADDRESS(channel, usb_index) \ + (CVMX_USBCX_GOTGCTL (usb_index) + ((channel)+1 )*0x1000 )/** * struct octeon_temp_buffer - a bounce buffer for USB transfers
@@ -1290,7 +1291,8 @@ static struct cvmx_usb_pipe *cvmx_usb_open_pipe(struct cvmx_usb_state *usb,if (__cvmx_usb_pipe_needs_split (usb, pipe)) { pipe->interval = interval*8 ;/* Force start splits to be schedule on uFrame 0 */ - pipe->next_tx_frame = ((usb->frame_number+7 )&~7 ) + pipe->interval; + pipe->next_tx_frame = ((usb->frame_number+7 )&~7 ) + + pipe->interval; }else { pipe->interval = interval; pipe->next_tx_frame = usb->frame_number + pipe->interval;
@@ -1341,9 +1343,13 @@ static void __cvmx_usb_poll_rx_fifo(struct cvmx_usb_state *usb)return ;/* Get where the DMA engine would have written this data */ - address =__cvmx_usb_read_csr64 (usb,CVMX_USBNX_DMA0_INB_CHN0 (usb->index) + channel*8 ); + address =__cvmx_usb_read_csr64 (usb, +CVMX_USBNX_DMA0_INB_CHN0 (usb->index) + channel*8 ); + ptr =cvmx_phys_to_ptr (address); -__cvmx_usb_write_csr64 (usb,CVMX_USBNX_DMA0_INB_CHN0 (usb->index) + channel*8 , address + bytes); +__cvmx_usb_write_csr64 (usb, +CVMX_USBNX_DMA0_INB_CHN0 (usb->index) + channel*8 , + address + bytes);/* Loop writing the FIFO data for this packet into memory */ while (bytes >0 ) {
@@ -1548,19 +1554,27 @@ static void __cvmx_usb_start_channel_control(struct cvmx_usb_state *usb, usbc_hctsiz.s.pid =3 ;/* Setup */ bytes_to_transfer =sizeof (*header);/* All Control operations start with a setup going OUT */ - USB_SET_FIELD32(CVMX_USBCX_HCCHARX(channel, usb->index), union cvmx_usbcx_hccharx, epdir, CVMX_USB_DIRECTION_OUT); +USB_SET_FIELD32 (CVMX_USBCX_HCCHARX (channel, usb->index), + union cvmx_usbcx_hccharx, epdir, +CVMX_USB_DIRECTION_OUT );/* * Setup send the control header instead of the buffer data. The * buffer data will be used in the next stage */ -__cvmx_usb_write_csr64 (usb,CVMX_USBNX_DMA0_OUTB_CHN0 (usb->index) + channel*8 , transaction->control_header); +__cvmx_usb_write_csr64 (usb, +CVMX_USBNX_DMA0_OUTB_CHN0 (usb->index) + channel*8 , + transaction->control_header);break ;case CVMX_USB_STAGE_SETUP_SPLIT_COMPLETE : usbc_hctsiz.s.pid =3 ;/* Setup */ bytes_to_transfer =0 ;/* All Control operations start with a setup going OUT */ - USB_SET_FIELD32(CVMX_USBCX_HCCHARX(channel, usb->index), union cvmx_usbcx_hccharx, epdir, CVMX_USB_DIRECTION_OUT); - USB_SET_FIELD32(CVMX_USBCX_HCSPLTX(channel, usb->index), union cvmx_usbcx_hcspltx, compsplt, 1); +USB_SET_FIELD32 (CVMX_USBCX_HCCHARX (channel, usb->index), + union cvmx_usbcx_hccharx, epdir, +CVMX_USB_DIRECTION_OUT ); + +USB_SET_FIELD32 (CVMX_USBCX_HCSPLTX (channel, usb->index), + union cvmx_usbcx_hcspltx, compsplt, 1);break ;case CVMX_USB_STAGE_DATA : usbc_hctsiz.s.pid =__cvmx_usb_get_data_pid (pipe);
@@ -1690,6 +1704,7 @@ static void __cvmx_usb_start_channel(struct cvmx_usb_state *usb,/* Clear all channel status bits */ usbc_hcint.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_HCINTX (channel, usb->index)); +__cvmx_usb_write_csr32 (usb,CVMX_USBCX_HCINTX (channel, usb->index), usbc_hcint.u32);
@@ -1720,19 +1735,31 @@ static void __cvmx_usb_start_channel(struct cvmx_usb_state *usb,__cvmx_usb_write_csr32 (usb,CVMX_USBCX_HCINTMSKX (channel, usb->index), usbc_hcintmsk.u32);/* Enable the channel interrupt to propagate */ - usbc_haintmsk.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_HAINTMSK (usb->index)); + usbc_haintmsk.u32 =__cvmx_usb_read_csr32 (usb, +CVMX_USBCX_HAINTMSK (usb->index)); usbc_haintmsk.s.haintmsk |=1 <<channel; -__cvmx_usb_write_csr32 (usb,CVMX_USBCX_HAINTMSK (usb->index), usbc_haintmsk.u32); +__cvmx_usb_write_csr32 (usb, +CVMX_USBCX_HAINTMSK (usb->index), + usbc_haintmsk.u32); }/* Setup the locations the DMA engines use */ { -uint64_t dma_address = transaction->buffer + transaction->actual_bytes; +uint64_t dma_address = transaction->buffer + + transaction->actual_bytes;if (transaction->type ==CVMX_USB_TRANSFER_ISOCHRONOUS ) - dma_address = transaction->buffer + transaction->iso_packets[0 ].offset + transaction->actual_bytes; -__cvmx_usb_write_csr64 (usb,CVMX_USBNX_DMA0_OUTB_CHN0 (usb->index) + channel*8 , dma_address); -__cvmx_usb_write_csr64 (usb,CVMX_USBNX_DMA0_INB_CHN0 (usb->index) + channel*8 , dma_address); + dma_address = transaction->buffer + + transaction->iso_packets[0 ].offset + + transaction->actual_bytes; + +__cvmx_usb_write_csr64 (usb, +CVMX_USBNX_DMA0_OUTB_CHN0 (usb->index) + channel*8 , + dma_address); + +__cvmx_usb_write_csr64 (usb, +CVMX_USBNX_DMA0_INB_CHN0 (usb->index) + channel*8 , + dma_address); }/* Setup both the size of the transfer and the SPLIT characteristics */
@@ -2043,8 +2070,15 @@ static void __cvmx_usb_schedule(struct cvmx_usb_state *usb, int is_sof)* Without DMA we need to be careful to not schedule something * at the end of a frame and cause an overrun. */ -union cvmx_usbcx_hfnum hfnum = {.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_HFNUM (usb->index))}; -union cvmx_usbcx_hfir hfir = {.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_HFIR (usb->index))}; +union cvmx_usbcx_hfnum hfnum = { + .u32 =__cvmx_usb_read_csr32 (usb, +CVMX_USBCX_HFNUM (usb->index)) + }; + +union cvmx_usbcx_hfir hfir = { + .u32 =__cvmx_usb_read_csr32 (usb, +CVMX_USBCX_HFIR (usb->index)) + };if (hfnum.s.frrem < hfir.s.frint/4 ) goto done;
@@ -2663,7 +2697,9 @@ static int __cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) }/* Disable the channel interrupts now that it is done */ -__cvmx_usb_write_csr32 (usb,CVMX_USBCX_HCINTMSKX (channel, usb->index),0 ); +__cvmx_usb_write_csr32 (usb, +CVMX_USBCX_HCINTMSKX (channel, usb->index), +0 ); usb->idle_hardware_channels |= (1 <<channel);/* Make sure this channel is tied to a valid pipe */
@@ -3030,7 +3066,8 @@ static int __cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel)*/ if (!buffer_space_left || (bytes_this_transfer <188 )) { - pipe->next_tx_frame += pipe->interval; + pipe->next_tx_frame += + pipe->interval; __cvmx_usb_perform_complete( usb, pipe,
@@ -3140,17 +3177,21 @@ static int cvmx_usb_poll(struct cvmx_usb_state *usb)CVMX_PREFETCH (usb,4 *128 );/* Update the frame counter */ - usbc_hfnum.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_HFNUM (usb->index)); + usbc_hfnum.u32 =__cvmx_usb_read_csr32 (usb, +CVMX_USBCX_HFNUM (usb->index));if ((usb->frame_number&0x3fff ) > usbc_hfnum.s.frnum) usb->frame_number +=0x4000 ; usb->frame_number &= ~0x3fffull ; usb->frame_number |= usbc_hfnum.s.frnum;/* Read the pending interrupts */ - usbc_gintsts.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_GINTSTS (usb->index)); + usbc_gintsts.u32 =__cvmx_usb_read_csr32 (usb, +CVMX_USBCX_GINTSTS (usb->index));/* Clear the interrupts now that we know about them */ -__cvmx_usb_write_csr32 (usb,CVMX_USBCX_GINTSTS (usb->index), usbc_gintsts.u32); +__cvmx_usb_write_csr32 (usb, +CVMX_USBCX_GINTSTS (usb->index), + usbc_gintsts.u32);if (usbc_gintsts.s.rxflvl) {/*
@@ -3207,7 +3248,8 @@ static int cvmx_usb_poll(struct cvmx_usb_state *usb)*/ union cvmx_usbcx_haint usbc_haint; - usbc_haint.u32 =__cvmx_usb_read_csr32 (usb,CVMX_USBCX_HAINT (usb->index)); + usbc_haint.u32 =__cvmx_usb_read_csr32 (usb, +CVMX_USBCX_HAINT (usb->index));while (usbc_haint.u32) {int channel;
@@ -3500,7 +3542,8 @@ static int octeon_usb_hub_status_data(struct usb_hcd *hcd, char *buf)return (buf[0 ] !=0 ); } -static int octeon_usb_hub_control (struct usb_hcd *hcd,u16 typeReq,u16 wValue,u16 wIndex,char *buf,u16 wLength) +static int octeon_usb_hub_control (struct usb_hcd *hcd,u16 typeReq,u16 wValue, +u16 wIndex,char *buf,u16 wLength) {struct octeon_hcd *priv =hcd_to_octeon (hcd);struct device *dev = hcd->self.controller;
Signature · 1 line
1.7.9.5