diff options
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/dwc3/core.h | 12 | ||||
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/at91_udc.h | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h | 2 | ||||
| -rw-r--r-- | drivers/usb/musb-new/musb_gadget.c | 4 | ||||
| -rw-r--r-- | drivers/usb/musb/musb_core.h | 10 | ||||
| -rw-r--r-- | drivers/usb/musb/musb_hcd.c | 2 |
8 files changed, 18 insertions, 18 deletions
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 44533fd7fe..1502cb859a 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -691,8 +691,8 @@ struct dwc3_scratchpad_array { * @has_lpm_erratum: true when core was configured with LPM Erratum. Note that * there's now way for software to detect this in runtime. * @is_utmi_l1_suspend: the core asserts output signal - * 0 - utmi_sleep_n - * 1 - utmi_l1_suspend_n + * 0 - utmi_sleep_n + * 1 - utmi_l1_suspend_n * @is_selfpowered: true when we are selfpowered * @is_fpga: true when we are using the FPGA board * @needs_fifo_resize: not all users might want fifo resizing, flag it @@ -713,10 +713,10 @@ struct dwc3_scratchpad_array { * @dis_u2_susphy_quirk: set if we disable usb2 suspend phy * @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk * @tx_de_emphasis: Tx de-emphasis value - * 0 - -6dB de-emphasis - * 1 - -3.5dB de-emphasis - * 2 - No de-emphasis - * 3 - Reserved + * 0 - -6dB de-emphasis + * 1 - -3.5dB de-emphasis + * 2 - No de-emphasis + * 3 - Reserved * @index: index of _this_ controller * @list: to maintain the list of dwc3 controllers */ diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 4e68fb0a82..eb416b832a 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2209,7 +2209,7 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc) * BESL value in the LPM token is less than or equal to LPM * NYET threshold. */ - if (dwc->revision < DWC3_REVISION_240A && dwc->has_lpm_erratum) + if (dwc->revision < DWC3_REVISION_240A && dwc->has_lpm_erratum) WARN(true, "LPM Erratum not available on dwc3 revisisions < 2.40a\n"); if (dwc->has_lpm_erratum && dwc->revision >= DWC3_REVISION_240A) diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h index 96a521ee08..e18de0e2f0 100644 --- a/drivers/usb/gadget/at91_udc.h +++ b/drivers/usb/gadget/at91_udc.h @@ -35,7 +35,7 @@ #define AT91_UDP_ISR 0x1c /* Interrupt Status Register */ #define AT91_UDP_EP(n) (1 << (n)) /* Endpoint Interrupt Status */ -#define AT91_UDP_RXSUSP (1 << 8) /* USB Suspend Interrupt Status */ +#define AT91_UDP_RXSUSP (1 << 8) /* USB Suspend Interrupt Status */ #define AT91_UDP_RXRSM (1 << 9) /* USB Resume Interrupt Status */ #define AT91_UDP_EXTRSM (1 << 10) /* External Resume Interrupt Status [AT91RM9200 only] */ #define AT91_UDP_SOFINT (1 << 11) /* Start of Frame Interrupt Status */ diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index ba362b8f25..583ceb4d55 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c @@ -472,7 +472,7 @@ void udc_irq(void) * so using '|=' isn't safe as it may ack an interrupt. */ #define UDCCR_OEN (1 << 31) /* On-the-Go Enable */ -#define UDCCR_MASK_BITS (UDCCR_OEN | UDCCR_UDE) +#define UDCCR_MASK_BITS (UDCCR_OEN | UDCCR_UDE) static inline void udc_set_mask_UDCCR(int mask) { diff --git a/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h b/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h index f0f48a3354..8db88f0dcf 100644 --- a/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h +++ b/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h @@ -40,7 +40,7 @@ * * To generate the content of the array below, use ie. the following command: * $ hexdump -v -e '/4 "0x%08x, "' r8a779x_usb3_v3.dlmem | \ - * sed "s@\(.\{47\}\) @\1\n@g" + * sed "s@\(.\{47\}\) @\1\n@g" * * [1] git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git */ diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c index 5b149dac6d..1fef00b292 100644 --- a/drivers/usb/musb-new/musb_gadget.c +++ b/drivers/usb/musb-new/musb_gadget.c @@ -995,8 +995,8 @@ void musb_g_rx(struct musb *musb, u8 epnum) && (musb_ep->dma->actual_len == musb_ep->packet_sz)) { /* In double buffer case, continue to unload fifo if - * there is Rx packet in FIFO. - **/ + * there is Rx packet in FIFO. + **/ csr = musb_readw(epio, MUSB_RXCSR); if ((csr & MUSB_RXCSR_RXPKTRDY) && hw_ep->rx_double_buffered) diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index e5d8ac7028..47b839c083 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -207,14 +207,14 @@ struct musb_regs { /* TxType/RxType */ #define MUSB_TYPE_SPEED 0xc0 #define MUSB_TYPE_SPEED_SHIFT 6 -#define MUSB_TYPE_SPEED_HIGH 1 -#define MUSB_TYPE_SPEED_FULL 2 +#define MUSB_TYPE_SPEED_HIGH 1 +#define MUSB_TYPE_SPEED_FULL 2 #define MUSB_TYPE_SPEED_LOW 3 #define MUSB_TYPE_PROTO 0x30 /* Implicitly zero for ep0 */ #define MUSB_TYPE_PROTO_SHIFT 4 #define MUSB_TYPE_REMOTE_END 0xf /* Implicitly zero for ep0 */ -#define MUSB_TYPE_PROTO_BULK 2 -#define MUSB_TYPE_PROTO_INTR 3 +#define MUSB_TYPE_PROTO_BULK 2 +#define MUSB_TYPE_PROTO_INTR 3 /* CONFIGDATA */ #define MUSB_CONFIGDATA_MPRXE 0x80 /* Auto bulk pkt combining */ @@ -304,7 +304,7 @@ struct musb_regs { * values are not supported */ struct musb_epinfo { - u8 epnum; /* endpoint number */ + u8 epnum; /* endpoint number */ u8 epdir; /* endpoint direction */ u16 epsize; /* endpoint FIFO size */ }; diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c index ffed3b82be..17901704f5 100644 --- a/drivers/usb/musb/musb_hcd.c +++ b/drivers/usb/musb/musb_hcd.c @@ -14,7 +14,7 @@ #include "musb_hcd.h" /* MSC control transfers */ -#define USB_MSC_BBB_RESET 0xFF +#define USB_MSC_BBB_RESET 0xFF #define USB_MSC_BBB_GET_MAX_LUN 0xFE /* Endpoint configuration information */ |