* [PATCH 0/6] drivers/usb/gadget/amd5536udc.c: code cleanup.
@ 2012-02-25 1:14 Cyril Roelandt
2012-02-25 1:14 ` [PATCH 1/6] amd5536udc: Fix brace coding style issues Cyril Roelandt
` (5 more replies)
0 siblings, 6 replies; 17+ messages in thread
From: Cyril Roelandt @ 2012-02-25 1:14 UTC (permalink / raw)
To: balbi; +Cc: dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel
Hello,
This series of patches cleans up drivers/usb/gadget/amd5536udc.c, fixing the 33
warnings returned by scripts/checkpatch.pl.
Patch 1/6 removes unneeded braces around one-line statements in if statements
and loops.
Patch 2/6 removes unneeded whitespaces before '\n' in various strings.
Patch 3/6 fixes the indentation of a block.
Patch 4/6 uses the DEFINE_PCI_DEVICE_TABLE macro rather than "const struct
pci_device_id".
Patch 5/6 fixes the type of the ep_string variable.
Patch 6/6 removes a CVS marker that is no longer relevant.
These patches should be trivial and unlikely to break anything.
Regards,
Cyril Roelandt.
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 1/6] amd5536udc: Fix brace coding style issues. 2012-02-25 1:14 [PATCH 0/6] drivers/usb/gadget/amd5536udc.c: code cleanup Cyril Roelandt @ 2012-02-25 1:14 ` Cyril Roelandt 2012-02-27 14:35 ` Felipe Balbi 2012-02-25 1:14 ` [PATCH 2/6] amd5536udc: Fix " Cyril Roelandt ` (4 subsequent siblings) 5 siblings, 1 reply; 17+ messages in thread From: Cyril Roelandt @ 2012-02-25 1:14 UTC (permalink / raw) To: balbi Cc: dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel, Cyril Roelandt Remove a bunch of unneeded braces. Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> --- drivers/usb/gadget/amd5536udc.c | 93 +++++++++++++++------------------------ 1 files changed, 36 insertions(+), 57 deletions(-) diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c index c16ff55..8d19053 100644 --- a/drivers/usb/gadget/amd5536udc.c +++ b/drivers/usb/gadget/amd5536udc.c @@ -204,9 +204,8 @@ static void print_regs(struct udc *dev) DBG(dev, "DMA mode = BF (buffer fill mode)\n"); dev_info(&dev->pdev->dev, "DMA mode (%s)\n", "BF"); } - if (!use_dma) { + if (!use_dma) dev_info(&dev->pdev->dev, "FIFO mode\n"); - } DBG(dev, "-------------------------------------------------------\n"); } @@ -569,9 +568,8 @@ udc_free_request(struct usb_ep *usbep, struct usb_request *usbreq) VDBG(ep->dev, "req->td_data=%p\n", req->td_data); /* free dma chain if created */ - if (req->chain_len > 1) { + if (req->chain_len > 1) udc_free_dma_chain(ep->dev, req); - } pci_pool_free(ep->dev->data_requests, req->td_data, req->td_phys); @@ -639,9 +637,8 @@ udc_txfifo_write(struct udc_ep *ep, struct usb_request *req) bytes = remaining; /* dwords first */ - for (i = 0; i < bytes / UDC_DWORD_BYTES; i++) { + for (i = 0; i < bytes / UDC_DWORD_BYTES; i++) writel(*(buf + i), ep->txfifo); - } /* remaining bytes must be written by byte access */ for (j = 0; j < bytes % UDC_DWORD_BYTES; j++) { @@ -660,9 +657,8 @@ static int udc_rxfifo_read_dwords(struct udc *dev, u32 *buf, int dwords) VDBG(dev, "udc_read_dwords(): %d dwords\n", dwords); - for (i = 0; i < dwords; i++) { + for (i = 0; i < dwords; i++) *(buf + i) = readl(dev->rxfifo); - } return 0; } @@ -675,9 +671,8 @@ static int udc_rxfifo_read_bytes(struct udc *dev, u8 *buf, int bytes) VDBG(dev, "udc_read_bytes(): %d bytes\n", bytes); /* dwords first */ - for (i = 0; i < bytes / UDC_DWORD_BYTES; i++) { + for (i = 0; i < bytes / UDC_DWORD_BYTES; i++) *((u32 *)(buf + (i<<2))) = readl(dev->rxfifo); - } /* remaining bytes must be read by byte access */ if (bytes % UDC_DWORD_BYTES) { @@ -897,9 +892,8 @@ static struct udc_data_dma *udc_get_last_dma_desc(struct udc_request *req) struct udc_data_dma *td; td = req->td_data; - while (td && !(td->status & AMD_BIT(UDC_DMA_IN_STS_L))) { + while (td && !(td->status & AMD_BIT(UDC_DMA_IN_STS_L))) td = phys_to_virt(td->next); - } return td; @@ -949,21 +943,18 @@ static int udc_create_dma_chain( dma_addr = DMA_DONT_USE; /* unset L bit in first desc for OUT */ - if (!ep->in) { + if (!ep->in) req->td_data->status &= AMD_CLEAR_BIT(UDC_DMA_IN_STS_L); - } /* alloc only new desc's if not already available */ len = req->req.length / ep->ep.maxpacket; - if (req->req.length % ep->ep.maxpacket) { + if (req->req.length % ep->ep.maxpacket) len++; - } if (len > req->chain_len) { /* shorter chain already allocated before */ - if (req->chain_len > 1) { + if (req->chain_len > 1) udc_free_dma_chain(ep->dev, req); - } req->chain_len = len; create_new_chain = 1; } @@ -1006,11 +997,12 @@ static int udc_create_dma_chain( /* link td and assign tx bytes */ if (i == buf_len) { - if (create_new_chain) { + if (create_new_chain) req->td_data->next = dma_addr; - } else { - /* req->td_data->next = virt_to_phys(td); */ - } + /* + else + req->td_data->next = virt_to_phys(td); + */ /* write tx bytes */ if (ep->in) { /* first desc */ @@ -1024,11 +1016,12 @@ static int udc_create_dma_chain( UDC_DMA_IN_STS_TXBYTES); } } else { - if (create_new_chain) { + if (create_new_chain) last->next = dma_addr; - } else { - /* last->next = virt_to_phys(td); */ - } + /* + else + last->next = virt_to_phys(td); + */ if (ep->in) { /* write tx bytes */ td->status = AMD_ADDBITS(td->status, @@ -1479,11 +1472,10 @@ static int startup_registers(struct udc *dev) /* program speed */ tmp = readl(&dev->regs->cfg); - if (use_fullspeed) { + if (use_fullspeed) tmp = AMD_ADDBITS(tmp, UDC_DEVCFG_SPD_FS, UDC_DEVCFG_SPD); - } else { + else tmp = AMD_ADDBITS(tmp, UDC_DEVCFG_SPD_HS, UDC_DEVCFG_SPD); - } writel(tmp, &dev->regs->cfg); return 0; @@ -1504,9 +1496,8 @@ static void udc_basic_init(struct udc *dev) mod_timer(&udc_timer, jiffies - 1); } /* stop poll stall timer */ - if (timer_pending(&udc_pollstall_timer)) { + if (timer_pending(&udc_pollstall_timer)) mod_timer(&udc_pollstall_timer, jiffies - 1); - } /* disable DMA */ tmp = readl(&dev->regs->ctl); tmp &= AMD_UNMASK_BIT(UDC_DEVCTL_RDE); @@ -1540,11 +1531,10 @@ static void udc_setup_endpoints(struct udc *dev) /* read enum speed */ tmp = readl(&dev->regs->sts); tmp = AMD_GETBITS(tmp, UDC_DEVSTS_ENUM_SPEED); - if (tmp == UDC_DEVSTS_ENUM_SPEED_HIGH) { + if (tmp == UDC_DEVSTS_ENUM_SPEED_HIGH) dev->gadget.speed = USB_SPEED_HIGH; - } else if (tmp == UDC_DEVSTS_ENUM_SPEED_FULL) { + else if (tmp == UDC_DEVSTS_ENUM_SPEED_FULL) dev->gadget.speed = USB_SPEED_FULL; - } /* set basic ep parameters */ for (tmp = 0; tmp < UDC_EP_NUM; tmp++) { @@ -1570,9 +1560,8 @@ static void udc_setup_endpoints(struct udc *dev) * disabling ep interrupts when ENUM interrupt occurs but ep is * not enabled by gadget driver */ - if (!ep->desc) { + if (!ep->desc) ep_init(dev->regs, ep); - } if (use_dma) { /* @@ -1670,9 +1659,8 @@ static void udc_tasklet_disconnect(unsigned long par) spin_lock(&dev->lock); /* empty queues */ - for (tmp = 0; tmp < UDC_EP_NUM; tmp++) { + for (tmp = 0; tmp < UDC_EP_NUM; tmp++) empty_req_queue(&dev->ep[tmp]); - } } @@ -1746,9 +1734,8 @@ static void udc_timer_function(unsigned long v) * open the fifo */ udc_timer.expires = jiffies + HZ/UDC_RDE_TIMER_DIV; - if (!stop_timer) { + if (!stop_timer) add_timer(&udc_timer); - } } else { /* * fifo contains data now, setup timer for opening @@ -1760,9 +1747,8 @@ static void udc_timer_function(unsigned long v) set_rde++; /* debug: lhadmot_timer_start = 221070 */ udc_timer.expires = jiffies + HZ*UDC_RDE_TIMER_SECONDS; - if (!stop_timer) { + if (!stop_timer) add_timer(&udc_timer); - } } } else @@ -1907,19 +1893,17 @@ static void activate_control_endpoints(struct udc *dev) mod_timer(&udc_timer, jiffies - 1); } /* stop pollstall timer */ - if (timer_pending(&udc_pollstall_timer)) { + if (timer_pending(&udc_pollstall_timer)) mod_timer(&udc_pollstall_timer, jiffies - 1); - } /* enable DMA */ tmp = readl(&dev->regs->ctl); tmp |= AMD_BIT(UDC_DEVCTL_MODE) | AMD_BIT(UDC_DEVCTL_RDE) | AMD_BIT(UDC_DEVCTL_TDE); - if (use_dma_bufferfill_mode) { + if (use_dma_bufferfill_mode) tmp |= AMD_BIT(UDC_DEVCTL_BF); - } else if (use_dma_ppb_du) { + else if (use_dma_ppb_du) tmp |= AMD_BIT(UDC_DEVCTL_DU); - } writel(tmp, &dev->regs->ctl); } @@ -2104,9 +2088,8 @@ static void udc_ep0_set_rde(struct udc *dev) udc_timer.expires = jiffies + HZ/UDC_RDE_TIMER_DIV; set_rde = 1; - if (!stop_timer) { + if (!stop_timer) add_timer(&udc_timer); - } } } } @@ -2294,9 +2277,8 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix) jiffies + HZ*UDC_RDE_TIMER_SECONDS; set_rde = 1; - if (!stop_timer) { + if (!stop_timer) add_timer(&udc_timer); - } } if (ep->num != UDC_EP0OUT_IX) dev->data_ep_queued = 0; @@ -2318,9 +2300,8 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix) /* check pending CNAKS */ if (cnak_pending) { /* CNAk processing when rxfifo empty only */ - if (readl(&dev->regs->sts) & AMD_BIT(UDC_DEVSTS_RXFIFO_EMPTY)) { + if (readl(&dev->regs->sts) & AMD_BIT(UDC_DEVSTS_RXFIFO_EMPTY)) udc_process_cnak_queue(dev); - } } /* clear OUT bits in ep status */ @@ -2581,9 +2562,8 @@ __acquires(dev->lock) if (!timer_pending(&udc_timer)) { udc_timer.expires = jiffies + HZ/UDC_RDE_TIMER_DIV; - if (!stop_timer) { + if (!stop_timer) add_timer(&udc_timer); - } } } @@ -2697,9 +2677,8 @@ __acquires(dev->lock) /* check pending CNAKS */ if (cnak_pending) { /* CNAk processing when rxfifo empty only */ - if (readl(&dev->regs->sts) & AMD_BIT(UDC_DEVSTS_RXFIFO_EMPTY)) { + if (readl(&dev->regs->sts) & AMD_BIT(UDC_DEVSTS_RXFIFO_EMPTY)) udc_process_cnak_queue(dev); - } } finished: -- 1.7.9 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 1/6] amd5536udc: Fix brace coding style issues. 2012-02-25 1:14 ` [PATCH 1/6] amd5536udc: Fix brace coding style issues Cyril Roelandt @ 2012-02-27 14:35 ` Felipe Balbi 0 siblings, 0 replies; 17+ messages in thread From: Felipe Balbi @ 2012-02-27 14:35 UTC (permalink / raw) To: Cyril Roelandt Cc: balbi, dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel [-- Attachment #1: Type: text/plain, Size: 194 bytes --] On Sat, Feb 25, 2012 at 02:14:57AM +0100, Cyril Roelandt wrote: > Remove a bunch of unneeded braces. > > Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> applied, thanks -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/6] amd5536udc: Fix coding style issues. 2012-02-25 1:14 [PATCH 0/6] drivers/usb/gadget/amd5536udc.c: code cleanup Cyril Roelandt 2012-02-25 1:14 ` [PATCH 1/6] amd5536udc: Fix brace coding style issues Cyril Roelandt @ 2012-02-25 1:14 ` Cyril Roelandt 2012-02-27 14:35 ` Felipe Balbi 2012-02-25 1:14 ` [PATCH 3/6] amd5536udc: Fix indentation Cyril Roelandt ` (3 subsequent siblings) 5 siblings, 1 reply; 17+ messages in thread From: Cyril Roelandt @ 2012-02-25 1:14 UTC (permalink / raw) To: balbi Cc: dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel, Cyril Roelandt Remove unnecessary whitespaces. Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> --- drivers/usb/gadget/amd5536udc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c index 8d19053..a57f5cd 100644 --- a/drivers/usb/gadget/amd5536udc.c +++ b/drivers/usb/gadget/amd5536udc.c @@ -2114,7 +2114,7 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix) if (use_dma) { /* BNA event ? */ if (tmp & AMD_BIT(UDC_EPSTS_BNA)) { - DBG(dev, "BNA ep%dout occurred - DESPTR = %x \n", + DBG(dev, "BNA ep%dout occurred - DESPTR = %x\n", ep->num, readl(&ep->regs->desptr)); /* clear BNA */ writel(tmp | AMD_BIT(UDC_EPSTS_BNA), &ep->regs->sts); @@ -2329,7 +2329,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix) /* BNA ? */ if (epsts & AMD_BIT(UDC_EPSTS_BNA)) { dev_err(&dev->pdev->dev, - "BNA ep%din occurred - DESPTR = %08lx \n", + "BNA ep%din occurred - DESPTR = %08lx\n", ep->num, (unsigned long) readl(&ep->regs->desptr)); @@ -2342,7 +2342,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix) /* HE event ? */ if (epsts & AMD_BIT(UDC_EPSTS_HE)) { dev_err(&dev->pdev->dev, - "HE ep%dn occurred - DESPTR = %08lx \n", + "HE ep%dn occurred - DESPTR = %08lx\n", ep->num, (unsigned long) readl(&ep->regs->desptr)); /* clear HE */ @@ -2702,7 +2702,7 @@ static irqreturn_t udc_control_in_isr(struct udc *dev) tmp = readl(&dev->ep[UDC_EP0IN_IX].regs->sts); /* DMA completion */ if (tmp & AMD_BIT(UDC_EPSTS_TDC)) { - VDBG(dev, "isr: TDC clear \n"); + VDBG(dev, "isr: TDC clear\n"); ret_val = IRQ_HANDLED; /* clear TDC bit */ -- 1.7.9 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 2/6] amd5536udc: Fix coding style issues. 2012-02-25 1:14 ` [PATCH 2/6] amd5536udc: Fix " Cyril Roelandt @ 2012-02-27 14:35 ` Felipe Balbi 0 siblings, 0 replies; 17+ messages in thread From: Felipe Balbi @ 2012-02-27 14:35 UTC (permalink / raw) To: Cyril Roelandt Cc: balbi, dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel [-- Attachment #1: Type: text/plain, Size: 191 bytes --] On Sat, Feb 25, 2012 at 02:14:58AM +0100, Cyril Roelandt wrote: > Remove unnecessary whitespaces. > > Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> applied, thanks -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 3/6] amd5536udc: Fix indentation. 2012-02-25 1:14 [PATCH 0/6] drivers/usb/gadget/amd5536udc.c: code cleanup Cyril Roelandt 2012-02-25 1:14 ` [PATCH 1/6] amd5536udc: Fix brace coding style issues Cyril Roelandt 2012-02-25 1:14 ` [PATCH 2/6] amd5536udc: Fix " Cyril Roelandt @ 2012-02-25 1:14 ` Cyril Roelandt 2012-02-27 14:36 ` Felipe Balbi 2012-02-25 1:15 ` [PATCH 4/6] amd5536udc: use the DEFINE_PCI_DEVICE_TABLE macro Cyril Roelandt ` (2 subsequent siblings) 5 siblings, 1 reply; 17+ messages in thread From: Cyril Roelandt @ 2012-02-25 1:14 UTC (permalink / raw) To: balbi Cc: dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel, Cyril Roelandt Remove an unnecessary level of indentation. Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> --- drivers/usb/gadget/amd5536udc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c index a57f5cd..3d627db 100644 --- a/drivers/usb/gadget/amd5536udc.c +++ b/drivers/usb/gadget/amd5536udc.c @@ -2408,9 +2408,9 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix) /* write fifo */ udc_txfifo_write(ep, &req->req); len = req->req.length - req->req.actual; - if (len > ep->ep.maxpacket) - len = ep->ep.maxpacket; - req->req.actual += len; + if (len > ep->ep.maxpacket) + len = ep->ep.maxpacket; + req->req.actual += len; if (req->req.actual == req->req.length || (len != ep->ep.maxpacket)) { /* complete req */ -- 1.7.9 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 3/6] amd5536udc: Fix indentation. 2012-02-25 1:14 ` [PATCH 3/6] amd5536udc: Fix indentation Cyril Roelandt @ 2012-02-27 14:36 ` Felipe Balbi 0 siblings, 0 replies; 17+ messages in thread From: Felipe Balbi @ 2012-02-27 14:36 UTC (permalink / raw) To: Cyril Roelandt Cc: balbi, dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel [-- Attachment #1: Type: text/plain, Size: 203 bytes --] On Sat, Feb 25, 2012 at 02:14:59AM +0100, Cyril Roelandt wrote: > Remove an unnecessary level of indentation. > > Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> applied, thanks -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 4/6] amd5536udc: use the DEFINE_PCI_DEVICE_TABLE macro. 2012-02-25 1:14 [PATCH 0/6] drivers/usb/gadget/amd5536udc.c: code cleanup Cyril Roelandt ` (2 preceding siblings ...) 2012-02-25 1:14 ` [PATCH 3/6] amd5536udc: Fix indentation Cyril Roelandt @ 2012-02-25 1:15 ` Cyril Roelandt 2012-02-27 14:37 ` Felipe Balbi 2012-02-25 1:15 ` [PATCH 5/6] amd5536udc: fix type of ep_string Cyril Roelandt 2012-02-25 1:15 ` [PATCH 6/6] amd5536udc: Remove old CVS markers Cyril Roelandt 5 siblings, 1 reply; 17+ messages in thread From: Cyril Roelandt @ 2012-02-25 1:15 UTC (permalink / raw) To: balbi Cc: dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel, Cyril Roelandt Use DEFINE_PCI_DEVICE_TABLE instead of "const struct pci_device_id". Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> --- drivers/usb/gadget/amd5536udc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c index 3d627db..3d563d0 100644 --- a/drivers/usb/gadget/amd5536udc.c +++ b/drivers/usb/gadget/amd5536udc.c @@ -3405,7 +3405,7 @@ static int udc_remote_wakeup(struct udc *dev) } /* PCI device parameters */ -static const struct pci_device_id pci_id[] = { +static DEFINE_PCI_DEVICE_TABLE(pci_id) = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x2096), .class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe, -- 1.7.9 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 4/6] amd5536udc: use the DEFINE_PCI_DEVICE_TABLE macro. 2012-02-25 1:15 ` [PATCH 4/6] amd5536udc: use the DEFINE_PCI_DEVICE_TABLE macro Cyril Roelandt @ 2012-02-27 14:37 ` Felipe Balbi 0 siblings, 0 replies; 17+ messages in thread From: Felipe Balbi @ 2012-02-27 14:37 UTC (permalink / raw) To: Cyril Roelandt Cc: balbi, dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel [-- Attachment #1: Type: text/plain, Size: 228 bytes --] On Sat, Feb 25, 2012 at 02:15:00AM +0100, Cyril Roelandt wrote: > Use DEFINE_PCI_DEVICE_TABLE instead of "const struct pci_device_id". > > Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> applied, thanks -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 5/6] amd5536udc: fix type of ep_string. 2012-02-25 1:14 [PATCH 0/6] drivers/usb/gadget/amd5536udc.c: code cleanup Cyril Roelandt ` (3 preceding siblings ...) 2012-02-25 1:15 ` [PATCH 4/6] amd5536udc: use the DEFINE_PCI_DEVICE_TABLE macro Cyril Roelandt @ 2012-02-25 1:15 ` Cyril Roelandt 2012-02-25 15:25 ` Sergei Shtylyov 2012-02-25 1:15 ` [PATCH 6/6] amd5536udc: Remove old CVS markers Cyril Roelandt 5 siblings, 1 reply; 17+ messages in thread From: Cyril Roelandt @ 2012-02-25 1:15 UTC (permalink / raw) To: balbi Cc: dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel, Cyril Roelandt Use "static const char *" instead of "static const char *const". Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> --- drivers/usb/gadget/amd5536udc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c index 3d563d0..16079bd 100644 --- a/drivers/usb/gadget/amd5536udc.c +++ b/drivers/usb/gadget/amd5536udc.c @@ -140,7 +140,7 @@ static DECLARE_TASKLET(disconnect_tasklet, udc_tasklet_disconnect, /* endpoint names used for print */ static const char ep0_string[] = "ep0in"; -static const char *ep_string[] = { +static const char *const ep_string[] = { ep0_string, "ep1in-int", "ep2in-bulk", "ep3in-bulk", "ep4in-bulk", "ep5in-bulk", "ep6in-bulk", "ep7in-bulk", "ep8in-bulk", "ep9in-bulk", "ep10in-bulk", -- 1.7.9 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 5/6] amd5536udc: fix type of ep_string. 2012-02-25 1:15 ` [PATCH 5/6] amd5536udc: fix type of ep_string Cyril Roelandt @ 2012-02-25 15:25 ` Sergei Shtylyov 2012-02-26 14:57 ` Cyril Roelandt 2012-02-26 15:00 ` [PATCH 5/6] amd5536udc: Fix the " Cyril Roelandt 0 siblings, 2 replies; 17+ messages in thread From: Sergei Shtylyov @ 2012-02-25 15:25 UTC (permalink / raw) To: Cyril Roelandt Cc: balbi, dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel Hello. On 25-02-2012 5:15, Cyril Roelandt wrote: > Use "static const char *" instead of "static const char *const". You're doing exactly oppposite. > Signed-off-by: Cyril Roelandt<tipecaml@gmail.com> > --- > drivers/usb/gadget/amd5536udc.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c > index 3d563d0..16079bd 100644 > --- a/drivers/usb/gadget/amd5536udc.c > +++ b/drivers/usb/gadget/amd5536udc.c > @@ -140,7 +140,7 @@ static DECLARE_TASKLET(disconnect_tasklet, udc_tasklet_disconnect, > > /* endpoint names used for print */ > static const char ep0_string[] = "ep0in"; > -static const char *ep_string[] = { > +static const char *const ep_string[] = { > ep0_string, > "ep1in-int", "ep2in-bulk", "ep3in-bulk", "ep4in-bulk", "ep5in-bulk", > "ep6in-bulk", "ep7in-bulk", "ep8in-bulk", "ep9in-bulk", "ep10in-bulk", WBR, Sergei ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 5/6] amd5536udc: fix type of ep_string. 2012-02-25 15:25 ` Sergei Shtylyov @ 2012-02-26 14:57 ` Cyril Roelandt 2012-02-26 15:00 ` [PATCH 5/6] amd5536udc: Fix the " Cyril Roelandt 1 sibling, 0 replies; 17+ messages in thread From: Cyril Roelandt @ 2012-02-26 14:57 UTC (permalink / raw) To: Sergei Shtylyov Cc: balbi, dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel On 02/25/2012 04:25 PM, Sergei Shtylyov wrote: > Hello. > > On 25-02-2012 5:15, Cyril Roelandt wrote: > >> Use "static const char *" instead of "static const char *const". > > You're doing exactly oppposite. > Hello, Thanks for pointing this out. Indeed, I made a mistake in the commit message. I'll resend this patch. WBR, Cyril Roelandt. ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 5/6] amd5536udc: Fix the type of ep_string. 2012-02-25 15:25 ` Sergei Shtylyov 2012-02-26 14:57 ` Cyril Roelandt @ 2012-02-26 15:00 ` Cyril Roelandt 2012-02-27 10:51 ` Sergei Shtylyov 2012-02-27 14:37 ` Felipe Balbi 1 sibling, 2 replies; 17+ messages in thread From: Cyril Roelandt @ 2012-02-26 15:00 UTC (permalink / raw) To: balbi Cc: dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel, Cyril Roelandt Use "static const char *const" instead of "static const char *". Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> --- drivers/usb/gadget/amd5536udc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c index 3d563d0..16079bd 100644 --- a/drivers/usb/gadget/amd5536udc.c +++ b/drivers/usb/gadget/amd5536udc.c @@ -140,7 +140,7 @@ static DECLARE_TASKLET(disconnect_tasklet, udc_tasklet_disconnect, /* endpoint names used for print */ static const char ep0_string[] = "ep0in"; -static const char *ep_string[] = { +static const char *const ep_string[] = { ep0_string, "ep1in-int", "ep2in-bulk", "ep3in-bulk", "ep4in-bulk", "ep5in-bulk", "ep6in-bulk", "ep7in-bulk", "ep8in-bulk", "ep9in-bulk", "ep10in-bulk", -- 1.7.9 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 5/6] amd5536udc: Fix the type of ep_string. 2012-02-26 15:00 ` [PATCH 5/6] amd5536udc: Fix the " Cyril Roelandt @ 2012-02-27 10:51 ` Sergei Shtylyov 2012-02-27 14:37 ` Felipe Balbi 1 sibling, 0 replies; 17+ messages in thread From: Sergei Shtylyov @ 2012-02-27 10:51 UTC (permalink / raw) To: Cyril Roelandt Cc: balbi, dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel Hello. On 26-02-2012 19:00, Cyril Roelandt wrote: > Use "static const char *const" instead of "static const char *". > Signed-off-by: Cyril Roelandt<tipecaml@gmail.com> You should have added something like "v2" to the [PATCH] prefix, since you changed the patch, not just resent it... WBR, Sergei ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 5/6] amd5536udc: Fix the type of ep_string. 2012-02-26 15:00 ` [PATCH 5/6] amd5536udc: Fix the " Cyril Roelandt 2012-02-27 10:51 ` Sergei Shtylyov @ 2012-02-27 14:37 ` Felipe Balbi 1 sibling, 0 replies; 17+ messages in thread From: Felipe Balbi @ 2012-02-27 14:37 UTC (permalink / raw) To: Cyril Roelandt Cc: balbi, dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel [-- Attachment #1: Type: text/plain, Size: 224 bytes --] On Sun, Feb 26, 2012 at 04:00:25PM +0100, Cyril Roelandt wrote: > Use "static const char *const" instead of "static const char *". > > Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> applied, thanks -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 6/6] amd5536udc: Remove old CVS markers. 2012-02-25 1:14 [PATCH 0/6] drivers/usb/gadget/amd5536udc.c: code cleanup Cyril Roelandt ` (4 preceding siblings ...) 2012-02-25 1:15 ` [PATCH 5/6] amd5536udc: fix type of ep_string Cyril Roelandt @ 2012-02-25 1:15 ` Cyril Roelandt 2012-02-27 14:37 ` Felipe Balbi 5 siblings, 1 reply; 17+ messages in thread From: Cyril Roelandt @ 2012-02-25 1:15 UTC (permalink / raw) To: balbi Cc: dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel, Cyril Roelandt Git does not care about CVS markers. Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> --- drivers/usb/gadget/amd5536udc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c index 16079bd..19b01f7 100644 --- a/drivers/usb/gadget/amd5536udc.c +++ b/drivers/usb/gadget/amd5536udc.c @@ -29,7 +29,7 @@ /* Driver strings */ #define UDC_MOD_DESCRIPTION "AMD 5536 UDC - USB Device Controller" -#define UDC_DRIVER_VERSION_STRING "01.00.0206 - $Revision: #3 $" +#define UDC_DRIVER_VERSION_STRING "01.00.0206" /* system */ #include <linux/module.h> -- 1.7.9 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 6/6] amd5536udc: Remove old CVS markers. 2012-02-25 1:15 ` [PATCH 6/6] amd5536udc: Remove old CVS markers Cyril Roelandt @ 2012-02-27 14:37 ` Felipe Balbi 0 siblings, 0 replies; 17+ messages in thread From: Felipe Balbi @ 2012-02-27 14:37 UTC (permalink / raw) To: Cyril Roelandt Cc: balbi, dahlmann.thomas, gregkh, linux-geode, linux-usb, linux-kernel [-- Attachment #1: Type: text/plain, Size: 196 bytes --] On Sat, Feb 25, 2012 at 02:15:02AM +0100, Cyril Roelandt wrote: > Git does not care about CVS markers. > > Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> applied, thanks -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2012-02-27 14:37 UTC | newest] Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-02-25 1:14 [PATCH 0/6] drivers/usb/gadget/amd5536udc.c: code cleanup Cyril Roelandt 2012-02-25 1:14 ` [PATCH 1/6] amd5536udc: Fix brace coding style issues Cyril Roelandt 2012-02-27 14:35 ` Felipe Balbi 2012-02-25 1:14 ` [PATCH 2/6] amd5536udc: Fix " Cyril Roelandt 2012-02-27 14:35 ` Felipe Balbi 2012-02-25 1:14 ` [PATCH 3/6] amd5536udc: Fix indentation Cyril Roelandt 2012-02-27 14:36 ` Felipe Balbi 2012-02-25 1:15 ` [PATCH 4/6] amd5536udc: use the DEFINE_PCI_DEVICE_TABLE macro Cyril Roelandt 2012-02-27 14:37 ` Felipe Balbi 2012-02-25 1:15 ` [PATCH 5/6] amd5536udc: fix type of ep_string Cyril Roelandt 2012-02-25 15:25 ` Sergei Shtylyov 2012-02-26 14:57 ` Cyril Roelandt 2012-02-26 15:00 ` [PATCH 5/6] amd5536udc: Fix the " Cyril Roelandt 2012-02-27 10:51 ` Sergei Shtylyov 2012-02-27 14:37 ` Felipe Balbi 2012-02-25 1:15 ` [PATCH 6/6] amd5536udc: Remove old CVS markers Cyril Roelandt 2012-02-27 14:37 ` Felipe Balbi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).