aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/amd5536udc.c14
-rw-r--r--drivers/usb/gadget/amd5536udc.h2
-rw-r--r--drivers/usb/gadget/at91_udc.c2
-rw-r--r--drivers/usb/gadget/composite.c6
-rw-r--r--drivers/usb/gadget/f_audio.c2
-rw-r--r--drivers/usb/gadget/f_ncm.c2
-rw-r--r--drivers/usb/gadget/fsl_qe_udc.h6
-rw-r--r--drivers/usb/gadget/fsl_udc_core.c6
-rw-r--r--drivers/usb/gadget/fsl_usb2_udc.h4
-rw-r--r--drivers/usb/gadget/gmidi.c2
-rw-r--r--drivers/usb/gadget/langwell_udc.c2
-rw-r--r--drivers/usb/gadget/mv_udc_core.c6
-rw-r--r--drivers/usb/gadget/net2280.c2
-rw-r--r--drivers/usb/gadget/nokia.c2
-rw-r--r--drivers/usb/gadget/printer.c2
-rw-r--r--drivers/usb/gadget/pxa27x_udc.c12
-rw-r--r--drivers/usb/gadget/s3c-hsotg.c18
17 files changed, 45 insertions, 45 deletions
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index f8dd7269d79c..6e42aab75806 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -278,7 +278,7 @@ static int udc_enable_dev_setup_interrupts(struct udc *dev)
278 return 0; 278 return 0;
279} 279}
280 280
281/* Calculates fifo start of endpoint based on preceeding endpoints */ 281/* Calculates fifo start of endpoint based on preceding endpoints */
282static int udc_set_txfifo_addr(struct udc_ep *ep) 282static int udc_set_txfifo_addr(struct udc_ep *ep)
283{ 283{
284 struct udc *dev; 284 struct udc *dev;
@@ -2137,7 +2137,7 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix)
2137 if (use_dma) { 2137 if (use_dma) {
2138 /* BNA event ? */ 2138 /* BNA event ? */
2139 if (tmp & AMD_BIT(UDC_EPSTS_BNA)) { 2139 if (tmp & AMD_BIT(UDC_EPSTS_BNA)) {
2140 DBG(dev, "BNA ep%dout occured - DESPTR = %x \n", 2140 DBG(dev, "BNA ep%dout occurred - DESPTR = %x \n",
2141 ep->num, readl(&ep->regs->desptr)); 2141 ep->num, readl(&ep->regs->desptr));
2142 /* clear BNA */ 2142 /* clear BNA */
2143 writel(tmp | AMD_BIT(UDC_EPSTS_BNA), &ep->regs->sts); 2143 writel(tmp | AMD_BIT(UDC_EPSTS_BNA), &ep->regs->sts);
@@ -2151,7 +2151,7 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix)
2151 } 2151 }
2152 /* HE event ? */ 2152 /* HE event ? */
2153 if (tmp & AMD_BIT(UDC_EPSTS_HE)) { 2153 if (tmp & AMD_BIT(UDC_EPSTS_HE)) {
2154 dev_err(&dev->pdev->dev, "HE ep%dout occured\n", ep->num); 2154 dev_err(&dev->pdev->dev, "HE ep%dout occurred\n", ep->num);
2155 2155
2156 /* clear HE */ 2156 /* clear HE */
2157 writel(tmp | AMD_BIT(UDC_EPSTS_HE), &ep->regs->sts); 2157 writel(tmp | AMD_BIT(UDC_EPSTS_HE), &ep->regs->sts);
@@ -2354,7 +2354,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
2354 /* BNA ? */ 2354 /* BNA ? */
2355 if (epsts & AMD_BIT(UDC_EPSTS_BNA)) { 2355 if (epsts & AMD_BIT(UDC_EPSTS_BNA)) {
2356 dev_err(&dev->pdev->dev, 2356 dev_err(&dev->pdev->dev,
2357 "BNA ep%din occured - DESPTR = %08lx \n", 2357 "BNA ep%din occurred - DESPTR = %08lx \n",
2358 ep->num, 2358 ep->num,
2359 (unsigned long) readl(&ep->regs->desptr)); 2359 (unsigned long) readl(&ep->regs->desptr));
2360 2360
@@ -2367,7 +2367,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
2367 /* HE event ? */ 2367 /* HE event ? */
2368 if (epsts & AMD_BIT(UDC_EPSTS_HE)) { 2368 if (epsts & AMD_BIT(UDC_EPSTS_HE)) {
2369 dev_err(&dev->pdev->dev, 2369 dev_err(&dev->pdev->dev,
2370 "HE ep%dn occured - DESPTR = %08lx \n", 2370 "HE ep%dn occurred - DESPTR = %08lx \n",
2371 ep->num, (unsigned long) readl(&ep->regs->desptr)); 2371 ep->num, (unsigned long) readl(&ep->regs->desptr));
2372 2372
2373 /* clear HE */ 2373 /* clear HE */
@@ -2384,7 +2384,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
2384 req = list_entry(ep->queue.next, 2384 req = list_entry(ep->queue.next,
2385 struct udc_request, queue); 2385 struct udc_request, queue);
2386 /* 2386 /*
2387 * length bytes transfered 2387 * length bytes transferred
2388 * check dma done of last desc. in PPBDU mode 2388 * check dma done of last desc. in PPBDU mode
2389 */ 2389 */
2390 if (use_dma_ppb_du) { 2390 if (use_dma_ppb_du) {
@@ -2784,7 +2784,7 @@ static irqreturn_t udc_control_in_isr(struct udc *dev)
2784 /* write fifo */ 2784 /* write fifo */
2785 udc_txfifo_write(ep, &req->req); 2785 udc_txfifo_write(ep, &req->req);
2786 2786
2787 /* lengh bytes transfered */ 2787 /* lengh bytes transferred */
2788 len = req->req.length - req->req.actual; 2788 len = req->req.length - req->req.actual;
2789 if (len > ep->ep.maxpacket) 2789 if (len > ep->ep.maxpacket)
2790 len = ep->ep.maxpacket; 2790 len = ep->ep.maxpacket;
diff --git a/drivers/usb/gadget/amd5536udc.h b/drivers/usb/gadget/amd5536udc.h
index 4bbabbbfc93f..1d1c7543468e 100644
--- a/drivers/usb/gadget/amd5536udc.h
+++ b/drivers/usb/gadget/amd5536udc.h
@@ -584,7 +584,7 @@ union udc_setup_data {
584 * SET and GET bitfields in u32 values 584 * SET and GET bitfields in u32 values
585 * via constants for mask/offset: 585 * via constants for mask/offset:
586 * <bit_field_stub_name> is the text between 586 * <bit_field_stub_name> is the text between
587 * UDC_ and _MASK|_OFS of appropiate 587 * UDC_ and _MASK|_OFS of appropriate
588 * constant 588 * constant
589 * 589 *
590 * set bitfield value in u32 u32Val 590 * set bitfield value in u32 u32Val
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index bb8ddf0469f9..9b7cdb16f26b 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -826,7 +826,7 @@ done:
826 return status; 826 return status;
827} 827}
828 828
829/* reinit == restore inital software state */ 829/* reinit == restore initial software state */
830static void udc_reinit(struct at91_udc *udc) 830static void udc_reinit(struct at91_udc *udc)
831{ 831{
832 u32 i; 832 u32 i;
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index c2251c40a205..82314ed22506 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -42,7 +42,7 @@
42static struct usb_composite_driver *composite; 42static struct usb_composite_driver *composite;
43static int (*composite_gadget_bind)(struct usb_composite_dev *cdev); 43static int (*composite_gadget_bind)(struct usb_composite_dev *cdev);
44 44
45/* Some systems will need runtime overrides for the product identifers 45/* Some systems will need runtime overrides for the product identifiers
46 * published in the device descriptor, either numbers or strings or both. 46 * published in the device descriptor, either numbers or strings or both.
47 * String parameters are in UTF-8 (superset of ASCII's 7 bit characters). 47 * String parameters are in UTF-8 (superset of ASCII's 7 bit characters).
48 */ 48 */
@@ -205,14 +205,14 @@ int usb_function_activate(struct usb_function *function)
205 * usb_interface_id() is called from usb_function.bind() callbacks to 205 * usb_interface_id() is called from usb_function.bind() callbacks to
206 * allocate new interface IDs. The function driver will then store that 206 * allocate new interface IDs. The function driver will then store that
207 * ID in interface, association, CDC union, and other descriptors. It 207 * ID in interface, association, CDC union, and other descriptors. It
208 * will also handle any control requests targetted at that interface, 208 * will also handle any control requests targeted at that interface,
209 * particularly changing its altsetting via set_alt(). There may 209 * particularly changing its altsetting via set_alt(). There may
210 * also be class-specific or vendor-specific requests to handle. 210 * also be class-specific or vendor-specific requests to handle.
211 * 211 *
212 * All interface identifier should be allocated using this routine, to 212 * All interface identifier should be allocated using this routine, to
213 * ensure that for example different functions don't wrongly assign 213 * ensure that for example different functions don't wrongly assign
214 * different meanings to the same identifier. Note that since interface 214 * different meanings to the same identifier. Note that since interface
215 * identifers are configuration-specific, functions used in more than 215 * identifiers are configuration-specific, functions used in more than
216 * one configuration (or more than once in a given configuration) need 216 * one configuration (or more than once in a given configuration) need
217 * multiple versions of the relevant descriptors. 217 * multiple versions of the relevant descriptors.
218 * 218 *
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c
index 00975ed903d1..9abecfddb27d 100644
--- a/drivers/usb/gadget/f_audio.c
+++ b/drivers/usb/gadget/f_audio.c
@@ -742,7 +742,7 @@ int __init control_selector_init(struct f_audio *audio)
742} 742}
743 743
744/** 744/**
745 * audio_bind_config - add USB audio fucntion to a configuration 745 * audio_bind_config - add USB audio function to a configuration
746 * @c: the configuration to supcard the USB audio function 746 * @c: the configuration to supcard the USB audio function
747 * Context: single threaded during gadget setup 747 * Context: single threaded during gadget setup
748 * 748 *
diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index 130eee678c8b..86902a60bcdb 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -111,7 +111,7 @@ static inline unsigned ncm_bitrate(struct usb_gadget *g)
111#define NTB_OUT_SIZE 16384 111#define NTB_OUT_SIZE 16384
112 112
113/* 113/*
114 * skbs of size less than that will not be alligned 114 * skbs of size less than that will not be aligned
115 * to NCM's dwNtbInMaxSize to save bus bandwidth 115 * to NCM's dwNtbInMaxSize to save bus bandwidth
116 */ 116 */
117 117
diff --git a/drivers/usb/gadget/fsl_qe_udc.h b/drivers/usb/gadget/fsl_qe_udc.h
index bea5b827bebe..e35e24fd64bb 100644
--- a/drivers/usb/gadget/fsl_qe_udc.h
+++ b/drivers/usb/gadget/fsl_qe_udc.h
@@ -208,14 +208,14 @@ struct qe_frame{
208/* Frame status field */ 208/* Frame status field */
209/* Receive side */ 209/* Receive side */
210#define FRAME_OK 0x00000000 /* Frame tranmitted or received OK */ 210#define FRAME_OK 0x00000000 /* Frame tranmitted or received OK */
211#define FRAME_ERROR 0x80000000 /* Error occured on frame */ 211#define FRAME_ERROR 0x80000000 /* Error occurred on frame */
212#define START_FRAME_LOST 0x40000000 /* START_FRAME_LOST */ 212#define START_FRAME_LOST 0x40000000 /* START_FRAME_LOST */
213#define END_FRAME_LOST 0x20000000 /* END_FRAME_LOST */ 213#define END_FRAME_LOST 0x20000000 /* END_FRAME_LOST */
214#define RX_ER_NONOCT 0x10000000 /* Rx Non Octet Aligned Packet */ 214#define RX_ER_NONOCT 0x10000000 /* Rx Non Octet Aligned Packet */
215#define RX_ER_BITSTUFF 0x08000000 /* Frame Aborted --Received packet 215#define RX_ER_BITSTUFF 0x08000000 /* Frame Aborted --Received packet
216 with bit stuff error */ 216 with bit stuff error */
217#define RX_ER_CRC 0x04000000 /* Received packet with CRC error */ 217#define RX_ER_CRC 0x04000000 /* Received packet with CRC error */
218#define RX_ER_OVERUN 0x02000000 /* Over-run occured on reception */ 218#define RX_ER_OVERUN 0x02000000 /* Over-run occurred on reception */
219#define RX_ER_PID 0x01000000 /* Wrong PID received */ 219#define RX_ER_PID 0x01000000 /* Wrong PID received */
220/* Tranmit side */ 220/* Tranmit side */
221#define TX_ER_NAK 0x00800000 /* Received NAK handshake */ 221#define TX_ER_NAK 0x00800000 /* Received NAK handshake */
@@ -379,7 +379,7 @@ struct qe_udc {
379#define T_LSP 0x01000000 /* Low-speed transaction */ 379#define T_LSP 0x01000000 /* Low-speed transaction */
380#define T_PID 0x00c00000 /* packet id */ 380#define T_PID 0x00c00000 /* packet id */
381#define T_NAK 0x00100000 /* No ack. */ 381#define T_NAK 0x00100000 /* No ack. */
382#define T_STAL 0x00080000 /* Stall recieved */ 382#define T_STAL 0x00080000 /* Stall received */
383#define T_TO 0x00040000 /* time out */ 383#define T_TO 0x00040000 /* time out */
384#define T_UN 0x00020000 /* underrun */ 384#define T_UN 0x00020000 /* underrun */
385 385
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 912cb8e63fe3..07499c1cdcc4 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -464,7 +464,7 @@ static int fsl_ep_enable(struct usb_ep *_ep,
464 464
465 max = le16_to_cpu(desc->wMaxPacketSize); 465 max = le16_to_cpu(desc->wMaxPacketSize);
466 466
467 /* Disable automatic zlp generation. Driver is reponsible to indicate 467 /* Disable automatic zlp generation. Driver is responsible to indicate
468 * explicitly through req->req.zero. This is needed to enable multi-td 468 * explicitly through req->req.zero. This is needed to enable multi-td
469 * request. */ 469 * request. */
470 zlt = 1; 470 zlt = 1;
@@ -648,7 +648,7 @@ static void fsl_queue_td(struct fsl_ep *ep, struct fsl_req *req)
648 | EP_QUEUE_HEAD_STATUS_HALT)); 648 | EP_QUEUE_HEAD_STATUS_HALT));
649 dQH->size_ioc_int_sts &= temp; 649 dQH->size_ioc_int_sts &= temp;
650 650
651 /* Ensure that updates to the QH will occure before priming. */ 651 /* Ensure that updates to the QH will occur before priming. */
652 wmb(); 652 wmb();
653 653
654 /* Prime endpoint by writing 1 to ENDPTPRIME */ 654 /* Prime endpoint by writing 1 to ENDPTPRIME */
@@ -1459,7 +1459,7 @@ static int process_ep_req(struct fsl_udc *udc, int pipe,
1459 status = -EILSEQ; 1459 status = -EILSEQ;
1460 break; 1460 break;
1461 } else 1461 } else
1462 ERR("Unknown error has occured (0x%x)!\n", 1462 ERR("Unknown error has occurred (0x%x)!\n",
1463 errors); 1463 errors);
1464 1464
1465 } else if (le32_to_cpu(curr_td->size_ioc_sts) 1465 } else if (le32_to_cpu(curr_td->size_ioc_sts)
diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h
index 20aeceed48c7..e88cce5c2c0d 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/fsl_usb2_udc.h
@@ -15,7 +15,7 @@ struct usb_dr_device {
15 u8 res1[256]; 15 u8 res1[256];
16 u16 caplength; /* Capability Register Length */ 16 u16 caplength; /* Capability Register Length */
17 u16 hciversion; /* Host Controller Interface Version */ 17 u16 hciversion; /* Host Controller Interface Version */
18 u32 hcsparams; /* Host Controller Structual Parameters */ 18 u32 hcsparams; /* Host Controller Structural Parameters */
19 u32 hccparams; /* Host Controller Capability Parameters */ 19 u32 hccparams; /* Host Controller Capability Parameters */
20 u8 res2[20]; 20 u8 res2[20];
21 u32 dciversion; /* Device Controller Interface Version */ 21 u32 dciversion; /* Device Controller Interface Version */
@@ -52,7 +52,7 @@ struct usb_dr_host {
52 u8 res1[256]; 52 u8 res1[256];
53 u16 caplength; /* Capability Register Length */ 53 u16 caplength; /* Capability Register Length */
54 u16 hciversion; /* Host Controller Interface Version */ 54 u16 hciversion; /* Host Controller Interface Version */
55 u32 hcsparams; /* Host Controller Structual Parameters */ 55 u32 hcsparams; /* Host Controller Structural Parameters */
56 u32 hccparams; /* Host Controller Capability Parameters */ 56 u32 hccparams; /* Host Controller Capability Parameters */
57 u8 res2[20]; 57 u8 res2[20];
58 u32 dciversion; /* Device Controller Interface Version */ 58 u32 dciversion; /* Device Controller Interface Version */
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 0ab7e141d494..47b86b99d449 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -67,7 +67,7 @@ MODULE_PARM_DESC(index, "Index value for the USB MIDI Gadget adapter.");
67module_param(id, charp, 0444); 67module_param(id, charp, 0444);
68MODULE_PARM_DESC(id, "ID string for the USB MIDI Gadget adapter."); 68MODULE_PARM_DESC(id, "ID string for the USB MIDI Gadget adapter.");
69 69
70/* Some systems will want different product identifers published in the 70/* Some systems will want different product identifiers published in the
71 * device descriptor, either numbers or strings or both. These string 71 * device descriptor, either numbers or strings or both. These string
72 * parameters are in UTF-8 (superset of ASCII's 7 bit characters). 72 * parameters are in UTF-8 (superset of ASCII's 7 bit characters).
73 */ 73 */
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index 1eca8b47ce3c..9cee88a43a73 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -642,7 +642,7 @@ static int queue_dtd(struct langwell_ep *ep, struct langwell_request *req)
642 dqh->dtd_status &= dtd_status; 642 dqh->dtd_status &= dtd_status;
643 dev_vdbg(&dev->pdev->dev, "dqh->dtd_status = 0x%x\n", dqh->dtd_status); 643 dev_vdbg(&dev->pdev->dev, "dqh->dtd_status = 0x%x\n", dqh->dtd_status);
644 644
645 /* ensure that updates to the dQH will occure before priming */ 645 /* ensure that updates to the dQH will occur before priming */
646 wmb(); 646 wmb();
647 647
648 /* write 1 to endptprime register to PRIME endpoint */ 648 /* write 1 to endptprime register to PRIME endpoint */
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index d5468a7f38e0..b62b2640deb0 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -325,7 +325,7 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
325 325
326 /* 326 /*
327 * Ensure that updates to the QH will 327 * Ensure that updates to the QH will
328 * occure before priming. 328 * occur before priming.
329 */ 329 */
330 wmb(); 330 wmb();
331 331
@@ -338,7 +338,7 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
338 & EP_QUEUE_HEAD_NEXT_POINTER_MASK;; 338 & EP_QUEUE_HEAD_NEXT_POINTER_MASK;;
339 dqh->size_ioc_int_sts = 0; 339 dqh->size_ioc_int_sts = 0;
340 340
341 /* Ensure that updates to the QH will occure before priming. */ 341 /* Ensure that updates to the QH will occur before priming. */
342 wmb(); 342 wmb();
343 343
344 /* Prime the Endpoint */ 344 /* Prime the Endpoint */
@@ -1845,7 +1845,7 @@ static irqreturn_t mv_udc_irq(int irq, void *dev)
1845 return IRQ_NONE; 1845 return IRQ_NONE;
1846 } 1846 }
1847 1847
1848 /* Clear all the interrupts occured */ 1848 /* Clear all the interrupts occurred */
1849 writel(status, &udc->op_regs->usbsts); 1849 writel(status, &udc->op_regs->usbsts);
1850 1850
1851 if (status & USBSTS_ERR) 1851 if (status & USBSTS_ERR)
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index d09155b25d73..24696f7fa6a9 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -117,7 +117,7 @@ module_param (fifo_mode, ushort, 0644);
117 117
118/* enable_suspend -- When enabled, the driver will respond to 118/* enable_suspend -- When enabled, the driver will respond to
119 * USB suspend requests by powering down the NET2280. Otherwise, 119 * USB suspend requests by powering down the NET2280. Otherwise,
120 * USB suspend requests will be ignored. This is acceptible for 120 * USB suspend requests will be ignored. This is acceptable for
121 * self-powered devices 121 * self-powered devices
122 */ 122 */
123static int enable_suspend = 0; 123static int enable_suspend = 0;
diff --git a/drivers/usb/gadget/nokia.c b/drivers/usb/gadget/nokia.c
index b5364f9d7cd2..55ca63ad3506 100644
--- a/drivers/usb/gadget/nokia.c
+++ b/drivers/usb/gadget/nokia.c
@@ -203,7 +203,7 @@ static int __init nokia_bind(struct usb_composite_dev *cdev)
203 goto err_usb; 203 goto err_usb;
204 } 204 }
205 205
206 /* finaly register the configuration */ 206 /* finally register the configuration */
207 status = usb_add_config(cdev, &nokia_config_500ma_driver, 207 status = usb_add_config(cdev, &nokia_config_500ma_driver,
208 nokia_bind_config); 208 nokia_bind_config);
209 if (status < 0) 209 if (status < 0)
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 12ff6cffedc9..c3f2bd42bd5a 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -126,7 +126,7 @@ static struct printer_dev usb_printer_gadget;
126#define PRINTER_VENDOR_NUM 0x0525 /* NetChip */ 126#define PRINTER_VENDOR_NUM 0x0525 /* NetChip */
127#define PRINTER_PRODUCT_NUM 0xa4a8 /* Linux-USB Printer Gadget */ 127#define PRINTER_PRODUCT_NUM 0xa4a8 /* Linux-USB Printer Gadget */
128 128
129/* Some systems will want different product identifers published in the 129/* Some systems will want different product identifiers published in the
130 * device descriptor, either numbers or strings or both. These string 130 * device descriptor, either numbers or strings or both. These string
131 * parameters are in UTF-8 (superset of ASCII's 7 bit characters). 131 * parameters are in UTF-8 (superset of ASCII's 7 bit characters).
132 */ 132 */
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 2efd6732d130..78a39a41547d 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -602,7 +602,7 @@ static void inc_ep_stats_reqs(struct pxa_ep *ep, int is_in)
602/** 602/**
603 * inc_ep_stats_bytes - Update ep stats counts 603 * inc_ep_stats_bytes - Update ep stats counts
604 * @ep: physical endpoint 604 * @ep: physical endpoint
605 * @count: bytes transfered on endpoint 605 * @count: bytes transferred on endpoint
606 * @is_in: ep direction (USB_DIR_IN or 0) 606 * @is_in: ep direction (USB_DIR_IN or 0)
607 */ 607 */
608static void inc_ep_stats_bytes(struct pxa_ep *ep, int count, int is_in) 608static void inc_ep_stats_bytes(struct pxa_ep *ep, int count, int is_in)
@@ -877,7 +877,7 @@ static void nuke(struct pxa_ep *ep, int status)
877 * If there is less space in request than bytes received in OUT endpoint, 877 * If there is less space in request than bytes received in OUT endpoint,
878 * bytes are left in the OUT endpoint. 878 * bytes are left in the OUT endpoint.
879 * 879 *
880 * Returns how many bytes were actually transfered 880 * Returns how many bytes were actually transferred
881 */ 881 */
882static int read_packet(struct pxa_ep *ep, struct pxa27x_request *req) 882static int read_packet(struct pxa_ep *ep, struct pxa27x_request *req)
883{ 883{
@@ -914,7 +914,7 @@ static int read_packet(struct pxa_ep *ep, struct pxa27x_request *req)
914 * endpoint. If there are no bytes to transfer, doesn't write anything 914 * endpoint. If there are no bytes to transfer, doesn't write anything
915 * to physical endpoint. 915 * to physical endpoint.
916 * 916 *
917 * Returns how many bytes were actually transfered. 917 * Returns how many bytes were actually transferred.
918 */ 918 */
919static int write_packet(struct pxa_ep *ep, struct pxa27x_request *req, 919static int write_packet(struct pxa_ep *ep, struct pxa27x_request *req,
920 unsigned int max) 920 unsigned int max)
@@ -991,7 +991,7 @@ static int read_fifo(struct pxa_ep *ep, struct pxa27x_request *req)
991 * caller guarantees at least one packet buffer is ready (or a zlp). 991 * caller guarantees at least one packet buffer is ready (or a zlp).
992 * Doesn't complete the request, that's the caller's job 992 * Doesn't complete the request, that's the caller's job
993 * 993 *
994 * Returns 1 if request fully transfered, 0 if partial transfer 994 * Returns 1 if request fully transferred, 0 if partial transfer
995 */ 995 */
996static int write_fifo(struct pxa_ep *ep, struct pxa27x_request *req) 996static int write_fifo(struct pxa_ep *ep, struct pxa27x_request *req)
997{ 997{
@@ -1094,7 +1094,7 @@ static int read_ep0_fifo(struct pxa_ep *ep, struct pxa27x_request *req)
1094 * Sends a request (or a part of the request) to the control endpoint (ep0 in). 1094 * Sends a request (or a part of the request) to the control endpoint (ep0 in).
1095 * If the request doesn't fit, the remaining part will be sent from irq. 1095 * If the request doesn't fit, the remaining part will be sent from irq.
1096 * The request is considered fully written only if either : 1096 * The request is considered fully written only if either :
1097 * - last write transfered all remaining bytes, but fifo was not fully filled 1097 * - last write transferred all remaining bytes, but fifo was not fully filled
1098 * - last write was a 0 length write 1098 * - last write was a 0 length write
1099 * 1099 *
1100 * Returns 1 if request fully written, 0 if request only partially sent 1100 * Returns 1 if request fully written, 0 if request only partially sent
@@ -1548,7 +1548,7 @@ static int pxa_udc_get_frame(struct usb_gadget *_gadget)
1548 * pxa_udc_wakeup - Force udc device out of suspend 1548 * pxa_udc_wakeup - Force udc device out of suspend
1549 * @_gadget: usb gadget 1549 * @_gadget: usb gadget
1550 * 1550 *
1551 * Returns 0 if successfull, error code otherwise 1551 * Returns 0 if successful, error code otherwise
1552 */ 1552 */
1553static int pxa_udc_wakeup(struct usb_gadget *_gadget) 1553static int pxa_udc_wakeup(struct usb_gadget *_gadget)
1554{ 1554{
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index ef825c3baed9..0912679de99a 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -41,8 +41,8 @@
41/* EP0_MPS_LIMIT 41/* EP0_MPS_LIMIT
42 * 42 *
43 * Unfortunately there seems to be a limit of the amount of data that can 43 * Unfortunately there seems to be a limit of the amount of data that can
44 * be transfered by IN transactions on EP0. This is either 127 bytes or 3 44 * be transferred by IN transactions on EP0. This is either 127 bytes or 3
45 * packets (which practially means 1 packet and 63 bytes of data) when the 45 * packets (which practically means 1 packet and 63 bytes of data) when the
46 * MPS is set to 64. 46 * MPS is set to 64.
47 * 47 *
48 * This means if we are wanting to move >127 bytes of data, we need to 48 * This means if we are wanting to move >127 bytes of data, we need to
@@ -783,7 +783,7 @@ static void s3c_hsotg_start_req(struct s3c_hsotg *hsotg,
783 hsotg->regs + S3C_DIEPINT(index)); 783 hsotg->regs + S3C_DIEPINT(index));
784 784
785 /* Note, trying to clear the NAK here causes problems with transmit 785 /* Note, trying to clear the NAK here causes problems with transmit
786 * on the S3C6400 ending up with the TXFIFO becomming full. */ 786 * on the S3C6400 ending up with the TXFIFO becoming full. */
787 787
788 /* check ep is enabled */ 788 /* check ep is enabled */
789 if (!(readl(hsotg->regs + epctrl_reg) & S3C_DxEPCTL_EPEna)) 789 if (!(readl(hsotg->regs + epctrl_reg) & S3C_DxEPCTL_EPEna))
@@ -1176,10 +1176,10 @@ static void s3c_hsotg_process_control(struct s3c_hsotg *hsotg,
1176 writel(ctrl, hsotg->regs + reg); 1176 writel(ctrl, hsotg->regs + reg);
1177 1177
1178 dev_dbg(hsotg->dev, 1178 dev_dbg(hsotg->dev,
1179 "writen DxEPCTL=0x%08x to %08x (DxEPCTL=0x%08x)\n", 1179 "written DxEPCTL=0x%08x to %08x (DxEPCTL=0x%08x)\n",
1180 ctrl, reg, readl(hsotg->regs + reg)); 1180 ctrl, reg, readl(hsotg->regs + reg));
1181 1181
1182 /* don't belive we need to anything more to get the EP 1182 /* don't believe we need to anything more to get the EP
1183 * to reply with a STALL packet */ 1183 * to reply with a STALL packet */
1184 } 1184 }
1185} 1185}
@@ -1416,7 +1416,7 @@ static void s3c_hsotg_rx_data(struct s3c_hsotg *hsotg, int ep_idx, int size)
1416 * transaction. 1416 * transaction.
1417 * 1417 *
1418 * Note, since we don't write any data to the TxFIFO, then it is 1418 * Note, since we don't write any data to the TxFIFO, then it is
1419 * currently belived that we do not need to wait for any space in 1419 * currently believed that we do not need to wait for any space in
1420 * the TxFIFO. 1420 * the TxFIFO.
1421 */ 1421 */
1422static void s3c_hsotg_send_zlp(struct s3c_hsotg *hsotg, 1422static void s3c_hsotg_send_zlp(struct s3c_hsotg *hsotg,
@@ -1540,7 +1540,7 @@ static u32 s3c_hsotg_read_frameno(struct s3c_hsotg *hsotg)
1540 * that requires processing, so find out what is in there and do the 1540 * that requires processing, so find out what is in there and do the
1541 * appropriate read. 1541 * appropriate read.
1542 * 1542 *
1543 * The RXFIFO is a true FIFO, the packets comming out are still in packet 1543 * The RXFIFO is a true FIFO, the packets coming out are still in packet
1544 * chunks, so if you have x packets received on an endpoint you'll get x 1544 * chunks, so if you have x packets received on an endpoint you'll get x
1545 * FIFO events delivered, each with a packet's worth of data in it. 1545 * FIFO events delivered, each with a packet's worth of data in it.
1546 * 1546 *
@@ -2188,7 +2188,7 @@ irq_retry:
2188 2188
2189 /* these next two seem to crop-up occasionally causing the core 2189 /* these next two seem to crop-up occasionally causing the core
2190 * to shutdown the USB transfer, so try clearing them and logging 2190 * to shutdown the USB transfer, so try clearing them and logging
2191 * the occurence. */ 2191 * the occurrence. */
2192 2192
2193 if (gintsts & S3C_GINTSTS_GOUTNakEff) { 2193 if (gintsts & S3C_GINTSTS_GOUTNakEff) {
2194 dev_info(hsotg->dev, "GOUTNakEff triggered\n"); 2194 dev_info(hsotg->dev, "GOUTNakEff triggered\n");
@@ -2469,7 +2469,7 @@ static struct usb_ep_ops s3c_hsotg_ep_ops = {
2469 .queue = s3c_hsotg_ep_queue, 2469 .queue = s3c_hsotg_ep_queue,
2470 .dequeue = s3c_hsotg_ep_dequeue, 2470 .dequeue = s3c_hsotg_ep_dequeue,
2471 .set_halt = s3c_hsotg_ep_sethalt, 2471 .set_halt = s3c_hsotg_ep_sethalt,
2472 /* note, don't belive we have any call for the fifo routines */ 2472 /* note, don't believe we have any call for the fifo routines */
2473}; 2473};
2474 2474
2475/** 2475/**