drivers: usb: gadget: prefer pr_*() functions over raw printk()
Subsystems (5)
PATCH 1/1 drivers: usb: gadget: prefer pr_*() functions over raw printk()
Reduce a bit logging boilerplate by using the preferred pr_*() macros instead of raw printk().
--- drivers/usb/gadget/function/uvc.h | 2 +- drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +- drivers/usb/gadget/udc/fsl_udc_core.c | 4 +-- drivers/usb/gadget/udc/fsl_usb2_udc.h | 4 +-- drivers/usb/gadget/udc/fusb300_udc.c | 64 ++++++++++++++++----------------- drivers/usb/gadget/udc/goku_udc.c | 2 +- drivers/usb/gadget/udc/r8a66597-udc.h | 2 +- 7 files changed, 40 insertions(+), 40 deletions(-)
drivers/usb/gadget/function/uvc.h +1 -1
@@ -49,7 +49,7 @@ extern unsigned int uvc_gadget_trace_param; #define uvc_trace(flag, msg...) \ do { \ if (uvc_gadget_trace_param & flag) \ - printk(KERN_DEBUG "uvcvideo: " msg); \ + pr_debug("uvcvideo: " msg); \ } while (0) #define uvcg_dbg(f, fmt, args...) \
drivers/usb/gadget/udc/atmel_usba_udc.c +1 -1
@@ -1573,7 +1573,7 @@ static void usba_control_irq(struct usba_udc *udc, struct usba_ep *ep)* generate or receive a reply right away. */ usba_ep_writel (ep,CLR_STA ,USBA_RX_SETUP ); -/* printk(KERN_DEBUG "setup: %d: %02x.%02x\n", +/* pr_debug("setup: %d: %02x.%02x\n", ep->state, crq.crq.bRequestType, crq.crq.bRequest); */
drivers/usb/gadget/udc/fsl_udc_core.c +2 -2
@@ -1474,7 +1474,7 @@ __acquires(udc->lock)mdelay (10 ); tmp =fsl_readl (&dr_regs->portsc1) | (ptc <<16 );fsl_writel (tmp, &dr_regs->portsc1); -printk (KERN_INFO "udc: switch to test mode %d.\n" , ptc); +pr_info ("udc: switch to test mode %d.\n" , ptc); }return ;
@@ -1952,7 +1952,7 @@ static int fsl_udc_start(struct usb_gadget *g,if (!IS_ERR_OR_NULL (udc_controller->transceiver)) {/* Suspend the controller until OTG enable it */ udc_controller->stopped =1 ; -printk (KERN_INFO "Suspend udc for OTG auto detect\n" ); +pr_info ("Suspend udc for OTG auto detect\n" );/* connect to bus through transceiver */ if (!IS_ERR_OR_NULL (udc_controller->transceiver)) {
drivers/usb/gadget/udc/fsl_usb2_udc.h +2 -2
@@ -509,7 +509,7 @@ struct fsl_udc {/*-------------------------------------------------------------------------*/ #ifdef DEBUG -#define DBG(fmt, args...) printk(KERN_DEBUG "[%s] " fmt "\n", \ +#define DBG(fmt, args...) pr_debug("[%s] " fmt "\n", \ __func__, ## args)#else #define DBG(fmt, args...) do{}while(0)
@@ -535,7 +535,7 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length) p +=3 ; } *p =0 ; -printk (KERN_DEBUG "%6x: %s\n" , start, line); +pr_debug ("%6x: %s\n" , start, line); buf += num; start += num; length -= num;
drivers/usb/gadget/udc/fusb300_udc.c +32 -32
233 lines not on this page · raw message
drivers/usb/gadget/udc/goku_udc.c +1 -1
@@ -1748,7 +1748,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)int retval;if (!pdev->irq) { -printk (KERN_ERR "Check PCI %s IRQ setup!\n" ,pci_name (pdev)); +pr_err ("Check PCI %s IRQ setup!\n" ,pci_name (pdev)); retval = -ENODEV ; goto err; }
drivers/usb/gadget/udc/r8a66597-udc.h +1 -1
@@ -247,7 +247,7 @@ static inline u16 get_xtal_from_pdata(struct r8a66597_platdata *pdata) clock =XTAL48 ;break ;default : -printk (KERN_ERR "r8a66597: platdata clock is wrong.\n" ); +pr_err ("r8a66597: platdata clock is wrong.\n" );break ; }
Signature · 1 line
2.11.0
Hi Enrico,
Thank you for the patch.
Quoted 32 lines · metux IT consult
Reduce a bit logging boilerplate by using the preferred pr_*() macros instead of raw
printk().Signed-off-by Enrico Weigelt, metux IT consult <[email protected]>--- drivers/usb/gadget/function/uvc.h | 2 +- drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +- drivers/usb/gadget/udc/fsl_udc_core.c | 4 +-- drivers/usb/gadget/udc/fsl_usb2_udc.h | 4 +-- drivers/usb/gadget/udc/fusb300_udc.c | 64 ++++++++++++++++----------------- drivers/usb/gadget/udc/goku_udc.c | 2 +- drivers/usb/gadget/udc/r8a66597-udc.h | 2 +- 7 files changed, 40 insertions(+), 40 deletions(-)drivers/usb/gadget/function/uvc.h +1
-1@@ -49,7 +49,7 @@ extern unsigned int uvc_gadget_trace_param; #define uvc_trace(flag, msg...) \ do { \ if (uvc_gadget_trace_param & flag) \ - printk(KERN_DEBUG "uvcvideo: " msg); \ + pr_debug("uvcvideo: " msg); \ } while (0) #define uvcg_dbg(f, fmt, args...) \drivers/usb/gadget/udc/atmel_usba_udc.c +0
-0
drivers/usb/gadget/udc/atmel_usba_udc.c static void usba_control_irq(struct usba_udc *udc, struct usba_ep *ep) · line 1578
Quoted 7 lines
drivers/usb/gadget/udc/atmel_usba_udc.c +1
-1@@ -1573,7 +1573,7 @@ static void usba_control_irq(struct usba_udc *udc, struct usba_ep *ep)* generate or receive a reply right away. */ usba_ep_writel (ep,CLR_STA ,USBA_RX_SETUP ); -/* printk(KERN_DEBUG "setup: %d: %02x.%02x\n", +/* pr_debug("setup: %d: %02x.%02x\n", ep->state, crq.crq.bRequestType, crq.crq.bRequest); */
I wonder if this shouldn't be dropped instead, commented-out code isn't very useful.
Quoted 302 lines
drivers/usb/gadget/udc/fsl_udc_core.c +2
-2@@ -1474,7 +1474,7 @@ __acquires(udc->lock)mdelay (10 ); tmp =fsl_readl (&dr_regs->portsc1) | (ptc <<16 );fsl_writel (tmp, &dr_regs->portsc1); -printk (KERN_INFO "udc: switch to test mode %d.\n" , ptc); +pr_info ("udc: switch to test mode %d.\n" , ptc); }return ;@@ -1952,7 +1952,7 @@ static int fsl_udc_start(struct usb_gadget *g,if (!IS_ERR_OR_NULL (udc_controller->transceiver)) {/* Suspend the controller until OTG enable it */ udc_controller->stopped =1 ; -printk (KERN_INFO "Suspend udc for OTG auto detect\n" ); +pr_info ("Suspend udc for OTG auto detect\n" );/* connect to bus through transceiver */ if (!IS_ERR_OR_NULL (udc_controller->transceiver)) {drivers/usb/gadget/udc/fsl_usb2_udc.h +2
-2@@ -509,7 +509,7 @@ struct fsl_udc {/*-------------------------------------------------------------------------*/ #ifdef DEBUG -#define DBG(fmt, args...) printk(KERN_DEBUG "[%s] " fmt "\n", \ +#define DBG(fmt, args...) pr_debug("[%s] " fmt "\n", \ __func__, ## args)#else #define DBG(fmt, args...) do{}while(0)@@ -535,7 +535,7 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length) p +=3 ; } *p =0 ; -printk (KERN_DEBUG "%6x: %s\n" , start, line); +pr_debug ("%6x: %s\n" , start, line); buf += num; start += num; length -= num;drivers/usb/gadget/udc/fusb300_udc.c +32
-32@@ -352,24 +352,24 @@ static void fusb300_wrcxf(struct fusb300_ep *ep,for (i = length >>2 ; i >0 ; i--) { data = *tmp | *(tmp +1 ) <<8 | *(tmp +2 ) <<16 | *(tmp +3 ) <<24 ; -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data);iowrite32 (data, fusb300->reg +FUSB300_OFFSET_CXPORT ); tmp = tmp +4 ; }switch (length %4 ) {case 1 : data = *tmp; -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data);iowrite32 (data, fusb300->reg +FUSB300_OFFSET_CXPORT );break ;case 2 : data = *tmp | *(tmp +1 ) <<8 ; -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data);iowrite32 (data, fusb300->reg +FUSB300_OFFSET_CXPORT );break ;case 3 : data = *tmp | *(tmp +1 ) <<8 | *(tmp +2 ) <<16 ; -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data);iowrite32 (data, fusb300->reg +FUSB300_OFFSET_CXPORT );break ;default :@@ -390,7 +390,7 @@ static void fusb300_clear_epnstall(struct fusb300 *fusb300, u8 ep)u32 reg =ioread32 (fusb300->reg +FUSB300_OFFSET_EPSET0 (ep));if (reg &FUSB300_EPSET0_STL ) { -printk (KERN_DEBUG "EP%d stall... Clear!!\n" , ep); +pr_debug ("EP%d stall... Clear!!\n" , ep); reg |=FUSB300_EPSET0_STL_CLR ;iowrite32 (reg, fusb300->reg +FUSB300_OFFSET_EPSET0 (ep)); }@@ -402,7 +402,7 @@ static void ep0_queue(struct fusb300_ep *ep, struct fusb300_request *req)if (req->req.length) {fusb300_wrcxf (ep, req); }else -printk (KERN_DEBUG "%s : req->req.length = 0x%x\n" , +pr_debug ("%s : req->req.length = 0x%x\n" , __func__, req->req.length);if ((req->req.length == req->req.actual) || (req->req.actual < ep->ep.maxpacket))@@ -565,7 +565,7 @@ static void fusb300_rdcxf(struct fusb300 *fusb300,for (i = (length >>2 ); i >0 ; i--) { data =ioread32 (fusb300->reg +FUSB300_OFFSET_CXPORT ); -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data); *tmp = data &0xFF ; *(tmp +1 ) = (data >>8 ) &0xFF ; *(tmp +2 ) = (data >>16 ) &0xFF ;@@ -576,18 +576,18 @@ static void fusb300_rdcxf(struct fusb300 *fusb300,switch (length %4 ) {case 1 : data =ioread32 (fusb300->reg +FUSB300_OFFSET_CXPORT ); -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data); *tmp = data &0xFF ;break ;case 2 : data =ioread32 (fusb300->reg +FUSB300_OFFSET_CXPORT ); -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data); *tmp = data &0xFF ; *(tmp +1 ) = (data >>8 ) &0xFF ;break ;case 3 : data =ioread32 (fusb300->reg +FUSB300_OFFSET_CXPORT ); -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data); *tmp = data &0xFF ; *(tmp +1 ) = (data >>8 ) &0xFF ; *(tmp +2 ) = (data >>16 ) &0xFF ;@@ -610,7 +610,7 @@ static void fusb300_rdfifo(struct fusb300_ep *ep, req->req.actual += length;if (req->req.actual > req->req.length) -printk (KERN_DEBUG "req->req.actual > req->req.length\n" ); +pr_debug ("req->req.actual > req->req.length\n" );for (i = (length >>2 ); i >0 ; i--) { data = ioread32(fusb300->reg +@@ -649,7 +649,7 @@ static void fusb300_rdfifo(struct fusb300_ep *ep, reg =ioread32 (fusb300->reg +FUSB300_OFFSET_IGR1 ); reg &=FUSB300_IGR1_SYNF0_EMPTY_INT ;if (i) -printk (KERN_INFO "sync fifo is not empty!\n" ); +pr_info ("sync fifo is not empty!\n" ); i++; }while (!reg); }@@ -677,7 +677,7 @@ static u8 fusb300_get_cxstall(struct fusb300 *fusb300)static void request_error (struct fusb300 *fusb300) {fusb300_set_cxstall (fusb300); -printk (KERN_DEBUG "request error!!\n" ); +pr_debug ("request error!!\n" ); }static void get_status (struct fusb300 *fusb300,struct usb_ctrlrequest *ctrl)@@ -999,7 +999,7 @@ static void check_device_mode(struct fusb300 *fusb300) fusb300->gadget.speed =USB_SPEED_UNKNOWN ;break ; } -printk (KERN_INFO "dev_mode = %d\n" , (reg &FUSB300_GCR_DEVEN_MSK )); +pr_info ("dev_mode = %d\n" , (reg &FUSB300_GCR_DEVEN_MSK )); }@@ -1076,14 +1076,14 @@ static irqreturn_t fusb300_irq(int irq, void *_fusb300)if (int_grp1 &FUSB300_IGR1_WARM_RST_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_WARM_RST_INT ); -printk (KERN_INFO "fusb300_warmreset\n" ); +pr_info ("fusb300_warmreset\n" );fusb300_reset (); }if (int_grp1 &FUSB300_IGR1_HOT_RST_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_HOT_RST_INT ); -printk (KERN_INFO "fusb300_hotreset\n" ); +pr_info ("fusb300_hotreset\n" );fusb300_reset (); }@@ -1097,13 +1097,13 @@ static irqreturn_t fusb300_irq(int irq, void *_fusb300)if (int_grp1 &FUSB300_IGR1_CX_COMABT_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_CX_COMABT_INT ); -printk (KERN_INFO "fusb300_ep0abt\n" ); +pr_info ("fusb300_ep0abt\n" ); }if (int_grp1 &FUSB300_IGR1_VBUS_CHG_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_VBUS_CHG_INT ); -printk (KERN_INFO "fusb300_vbus_change\n" ); +pr_info ("fusb300_vbus_change\n" ); }if (int_grp1 &FUSB300_IGR1_U3_EXIT_FAIL_INT ) {@@ -1134,25 +1134,25 @@ static irqreturn_t fusb300_irq(int irq, void *_fusb300)if (int_grp1 &FUSB300_IGR1_U3_EXIT_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_U3_EXIT_INT ); -printk (KERN_INFO "FUSB300_IGR1_U3_EXIT_INT\n" ); +pr_info ("FUSB300_IGR1_U3_EXIT_INT\n" ); }if (int_grp1 &FUSB300_IGR1_U2_EXIT_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_U2_EXIT_INT ); -printk (KERN_INFO "FUSB300_IGR1_U2_EXIT_INT\n" ); +pr_info ("FUSB300_IGR1_U2_EXIT_INT\n" ); }if (int_grp1 &FUSB300_IGR1_U1_EXIT_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_U1_EXIT_INT ); -printk (KERN_INFO "FUSB300_IGR1_U1_EXIT_INT\n" ); +pr_info ("FUSB300_IGR1_U1_EXIT_INT\n" ); }if (int_grp1 &FUSB300_IGR1_U3_ENTRY_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_U3_ENTRY_INT ); -printk (KERN_INFO "FUSB300_IGR1_U3_ENTRY_INT\n" ); +pr_info ("FUSB300_IGR1_U3_ENTRY_INT\n" );fusb300_enable_bit (fusb300,FUSB300_OFFSET_SSCR1 ,FUSB300_SSCR1_GO_U3_DONE ); }@@ -1160,31 +1160,31 @@ static irqreturn_t fusb300_irq(int irq, void *_fusb300)if (int_grp1 &FUSB300_IGR1_U2_ENTRY_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_U2_ENTRY_INT ); -printk (KERN_INFO "FUSB300_IGR1_U2_ENTRY_INT\n" ); +pr_info ("FUSB300_IGR1_U2_ENTRY_INT\n" ); }if (int_grp1 &FUSB300_IGR1_U1_ENTRY_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_U1_ENTRY_INT ); -printk (KERN_INFO "FUSB300_IGR1_U1_ENTRY_INT\n" ); +pr_info ("FUSB300_IGR1_U1_ENTRY_INT\n" ); }if (int_grp1 &FUSB300_IGR1_RESM_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_RESM_INT ); -printk (KERN_INFO "fusb300_resume\n" ); +pr_info ("fusb300_resume\n" ); }if (int_grp1 &FUSB300_IGR1_SUSP_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_SUSP_INT ); -printk (KERN_INFO "fusb300_suspend\n" ); +pr_info ("fusb300_suspend\n" ); }if (int_grp1 &FUSB300_IGR1_HS_LPM_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_HS_LPM_INT ); -printk (KERN_INFO "fusb300_HS_LPM_INT\n" ); +pr_info ("fusb300_HS_LPM_INT\n" ); }if (int_grp1 &FUSB300_IGR1_DEV_MODE_CHG_INT ) {@@ -1195,11 +1195,11 @@ static irqreturn_t fusb300_irq(int irq, void *_fusb300)if (int_grp1 &FUSB300_IGR1_CX_COMFAIL_INT ) {fusb300_set_cxstall (fusb300); -printk (KERN_INFO "fusb300_ep0fail\n" ); +pr_info ("fusb300_ep0fail\n" ); }if (int_grp1 &FUSB300_IGR1_CX_SETUP_INT ) { -printk (KERN_INFO "fusb300_ep0setup\n" ); +pr_info ("fusb300_ep0setup\n" );if (setup_packet (fusb300, &ctrl)) {spin_unlock (&fusb300->lock);if (fusb300->driver->setup (&fusb300->gadget, &ctrl) <0 )@@ -1209,16 +1209,16 @@ static irqreturn_t fusb300_irq(int irq, void *_fusb300) }if (int_grp1 &FUSB300_IGR1_CX_CMDEND_INT ) -printk (KERN_INFO "fusb300_cmdend\n" ); +pr_info ("fusb300_cmdend\n" );if (int_grp1 &FUSB300_IGR1_CX_OUT_INT ) { -printk (KERN_INFO "fusb300_cxout\n" ); +pr_info ("fusb300_cxout\n" );fusb300_ep0out (fusb300); }if (int_grp1 &FUSB300_IGR1_CX_IN_INT ) { -printk (KERN_INFO "fusb300_cxin\n" ); +pr_info ("fusb300_cxin\n" );fusb300_ep0in (fusb300); }drivers/usb/gadget/udc/goku_udc.c +0
-0
drivers/usb/gadget/udc/goku_udc.c static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id) · line 1751
Quoted 5 lines
drivers/usb/gadget/udc/goku_udc.c +1
-1@@ -1748,7 +1748,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)int retval;if (!pdev->irq) { -printk (KERN_ERR "Check PCI %s IRQ setup!\n" ,pci_name (pdev)); +pr_err ("Check PCI %s IRQ setup!\n" ,pci_name (pdev));
When a pointer to a struct device is available, dev_err() would be much better. That's however out of scope for this patch, but it would be nice to address it. This would become
dev_err(&pdev->dev, "Check IRQ setup!\n");
Quoted 16 lines
drivers/usb/gadget/udc/goku_udc.c +0
-0retval = -ENODEV ; goto err; }drivers/usb/gadget/udc/r8a66597-udc.h +1
-1@@ -247,7 +247,7 @@ static inline u16 get_xtal_from_pdata(struct r8a66597_platdata *pdata) clock =XTAL48 ;break ;default : -printk (KERN_ERR "r8a66597: platdata clock is wrong.\n" ); +pr_err ("r8a66597: platdata clock is wrong.\n" );break ; }
Signature · 3 lines
Regards, Laurent Pinchart
On 08.12.20 16:54, Laurent Pinchart wrote:
Hi,
Quoted 8 lines
Quoted 8 lines
drivers/usb/gadget/udc/atmel_usba_udc.c +0
-0@@ -1573,7 +1573,7 @@ static void usba_control_irq(struct usba_udc *udc, struct usba_ep *ep)* generate or receive a reply right away. */ usba_ep_writel (ep,CLR_STA ,USBA_RX_SETUP );
Quoted 7 lines
drivers/usb/gadget/udc/atmel_usba_udc.c static void usba_control_irq(struct usba_udc *udc, struct usba_ep *ep) · line 1578
Quoted 4 lines
drivers/usb/gadget/udc/atmel_usba_udc.c +1
-1-/* printk(KERN_DEBUG "setup: %d: %02x.%02x\n", +/* pr_debug("setup: %d: %02x.%02x\n", ep->state, crq.crq.bRequestType, crq.crq.bRequest); */ I wonder if this shouldn't be dropped instead, commented-out code isn't very useful.
Indeed. Shall I send a separate patch for that ?
Quoted 6 lines
When a pointer to a struct device is available,
dev_err()would be much better. That's however out of scope for this patch, but it would be nice to address it. This would becomedev_err(&pdev->dev, "Check IRQ setup!\n");
You're right. I didn't check for that yet. I'll do it in a separate patch.
--mtx
Signature · 8 lines
--- Hinweis: unverschlüsselte E-Mails können leicht abgehört und manipuliert werden ! Für eine vertrauliche Kommunikation senden Sie bitte ihren GPG/PGP-Schlüssel zu. --- Enrico Weigelt, metux IT consult Free software and Linux embedded engineering [email protected] -- +49-151-27565287
Hi Enrico,
Quoted 17 lines · metux IT consult
Quoted 8 lines · Laurent Pinchart
Quoted 8 lines
drivers/usb/gadget/udc/atmel_usba_udc.c +0
-0@@ -1573,7 +1573,7 @@ static void usba_control_irq(struct usba_udc *udc, struct usba_ep *ep)* generate or receive a reply right away. */ usba_ep_writel (ep,CLR_STA ,USBA_RX_SETUP );Quoted 7 lines
drivers/usb/gadget/udc/atmel_usba_udc.c static void usba_control_irq(struct usba_udc *udc, struct usba_ep *ep) · line 1578
Quoted 4 lines
drivers/usb/gadget/udc/atmel_usba_udc.c +1
-1-/* printk(KERN_DEBUG "setup: %d: %02x.%02x\n", +/* pr_debug("setup: %d: %02x.%02x\n", ep->state, crq.crq.bRequestType, crq.crq.bRequest); */ I wonder if this shouldn't be dropped instead, commented-out code isn't very useful.
Quoted 1 line
Indeed. Shall I send a separate patch for that ?
Yes, that would make sense.
Quoted 9 lines
Quoted 6 lines
When a pointer to a struct device is available,
dev_err()would be much better. That's however out of scope for this patch, but it would be nice to address it. This would becomedev_err(&pdev->dev, "Check IRQ setup!\n");You're right. I didn't check for that yet. I'll do it in a separate patch.
As most of the files touched by this patch are device drivers, dev_*() functions should be used instead of pr_*() where possible. I'd recommend a first patch that converts to dev_*(), and then a second patch that converts the remaining printk()s, if any, to pr_*() in the contexts where no struct device is available or can easily be made available.
Signature · 3 lines
Regards, Laurent Pinchart
On 09.12.20 12:27, Laurent Pinchart wrote:
Hi,
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
I wonder if this shouldn't be dropped instead, commented-out code isn't very useful.
Indeed. Shall I send a separate patch for that ?
Yes, that would make sense.
Okay, I'm currently doing a more in-depth rework. I'll send another patch queue later.
Since I don't own the corresponding devices, I can't do much testing (just build tests and careful review), so I need some help w/ that.
Quoted 5 lines
As most of the files touched by this patch are device drivers, dev_*() functions should be used instead of pr_*() where possible. I'd recommend a first patch that converts to dev_*(), and then a second patch that converts the remaining printk()s, if any, to pr_*() in the contexts where no struct device is available or can easily be made available.
I'm now splitting it into per-driver patches. They're getting a bit bigger, since I'm also replacing some debug macros, etc. In some cases I'm introducing new helpers for not having to write long expressions to get the actual dev ptr, adding some prefixes (eg. per usb endpoint logging, ...).
--mtx
Signature · 8 lines
--- Hinweis: unverschlüsselte E-Mails können leicht abgehört und manipuliert werden ! Für eine vertrauliche Kommunikation senden Sie bitte ihren GPG/PGP-Schlüssel zu. --- Enrico Weigelt, metux IT consult Free software and Linux embedded engineering [email protected] -- +49-151-27565287
Quoted 2 lines · metux IT consult
Reduce a bit logging boilerplate by using the preferred pr_*() macros instead of raw
printk().
It is the device driver code, it is better to use dev_info/dev_dbg.
Peter
Quoted 363 lines
Signed-off-by Enrico Weigelt, metux IT consult <[email protected]>--- drivers/usb/gadget/function/uvc.h | 2 +- drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +- drivers/usb/gadget/udc/fsl_udc_core.c | 4 +-- drivers/usb/gadget/udc/fsl_usb2_udc.h | 4 +-- drivers/usb/gadget/udc/fusb300_udc.c | 64 ++++++++++++++++----------------- drivers/usb/gadget/udc/goku_udc.c | 2 +- drivers/usb/gadget/udc/r8a66597-udc.h | 2 +- 7 files changed, 40 insertions(+), 40 deletions(-)drivers/usb/gadget/function/uvc.h +1
-1@@ -49,7 +49,7 @@ extern unsigned int uvc_gadget_trace_param; #define uvc_trace(flag, msg...) \ do { \ if (uvc_gadget_trace_param & flag) \ - printk(KERN_DEBUG "uvcvideo: " msg); \ + pr_debug("uvcvideo: " msg); \ } while (0) #define uvcg_dbg(f, fmt, args...) \drivers/usb/gadget/udc/atmel_usba_udc.c +1
-1@@ -1573,7 +1573,7 @@ static void usba_control_irq(struct usba_udc *udc, struct usba_ep *ep)* generate or receive a reply right away. */ usba_ep_writel (ep,CLR_STA ,USBA_RX_SETUP ); -/* printk(KERN_DEBUG "setup: %d: %02x.%02x\n", +/* pr_debug("setup: %d: %02x.%02x\n", ep->state, crq.crq.bRequestType, crq.crq.bRequest); */ drivers/usb/gadget/udc/fsl_udc_core.c +2
-2@@ -1474,7 +1474,7 @@ __acquires(udc->lock)mdelay (10 ); tmp =fsl_readl (&dr_regs->portsc1) | (ptc <<16 );fsl_writel (tmp, &dr_regs->portsc1); -printk (KERN_INFO "udc: switch to test mode %d.\n" , ptc); +pr_info ("udc: switch to test mode %d.\n" , ptc); }return ;@@ -1952,7 +1952,7 @@ static int fsl_udc_start(struct usb_gadget *g,if (!IS_ERR_OR_NULL (udc_controller->transceiver)) {/* Suspend the controller until OTG enable it */ udc_controller->stopped =1 ; -printk (KERN_INFO "Suspend udc for OTG auto detect\n" ); +pr_info ("Suspend udc for OTG auto detect\n" );/* connect to bus through transceiver */ if (!IS_ERR_OR_NULL (udc_controller->transceiver)) {drivers/usb/gadget/udc/fsl_usb2_udc.h +2
-2@@ -509,7 +509,7 @@ struct fsl_udc {/*-------------------------------------------------------------------------*/ #ifdef DEBUG -#define DBG(fmt, args...) printk(KERN_DEBUG "[%s] " fmt "\n", \ +#define DBG(fmt, args...) pr_debug("[%s] " fmt "\n", \ __func__, ## args)#else #define DBG(fmt, args...) do{}while(0)@@ -535,7 +535,7 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length) p +=3 ; } *p =0 ; -printk (KERN_DEBUG "%6x: %s\n" , start, line); +pr_debug ("%6x: %s\n" , start, line); buf += num; start += num; length -= num;drivers/usb/gadget/udc/fusb300_udc.c +32
-32@@ -352,24 +352,24 @@ static void fusb300_wrcxf(struct fusb300_ep *ep,for (i = length >>2 ; i >0 ; i--) { data = *tmp | *(tmp +1 ) <<8 | *(tmp +2 ) <<16 | *(tmp +3 ) <<24 ; -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data);iowrite32 (data, fusb300->reg +FUSB300_OFFSET_CXPORT ); tmp = tmp +4 ; }switch (length %4 ) {case 1 : data = *tmp; -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data);iowrite32 (data, fusb300->reg +FUSB300_OFFSET_CXPORT );break ;case 2 : data = *tmp | *(tmp +1 ) <<8 ; -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data);iowrite32 (data, fusb300->reg +FUSB300_OFFSET_CXPORT );break ;case 3 : data = *tmp | *(tmp +1 ) <<8 | *(tmp +2 ) <<16 ; -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data);iowrite32 (data, fusb300->reg +FUSB300_OFFSET_CXPORT );break ;default :@@ -390,7 +390,7 @@ static void fusb300_clear_epnstall(struct fusb300 *fusb300, u8 ep)u32 reg =ioread32 (fusb300->reg +FUSB300_OFFSET_EPSET0 (ep));if (reg &FUSB300_EPSET0_STL ) { -printk (KERN_DEBUG "EP%d stall... Clear!!\n" , ep); +pr_debug ("EP%d stall... Clear!!\n" , ep); reg |=FUSB300_EPSET0_STL_CLR ;iowrite32 (reg, fusb300->reg +FUSB300_OFFSET_EPSET0 (ep)); }@@ -402,7 +402,7 @@ static void ep0_queue(struct fusb300_ep *ep, struct fusb300_request *req)if (req->req.length) {fusb300_wrcxf (ep, req); }else -printk (KERN_DEBUG "%s : req->req.length = 0x%x\n" , +pr_debug ("%s : req->req.length = 0x%x\n" , __func__, req->req.length);if ((req->req.length == req->req.actual) || (req->req.actual < ep->ep.maxpacket))@@ -565,7 +565,7 @@ static void fusb300_rdcxf(struct fusb300 *fusb300,for (i = (length >>2 ); i >0 ; i--) { data =ioread32 (fusb300->reg +FUSB300_OFFSET_CXPORT ); -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data); *tmp = data &0xFF ; *(tmp +1 ) = (data >>8 ) &0xFF ; *(tmp +2 ) = (data >>16 ) &0xFF ;@@ -576,18 +576,18 @@ static void fusb300_rdcxf(struct fusb300 *fusb300,switch (length %4 ) {case 1 : data =ioread32 (fusb300->reg +FUSB300_OFFSET_CXPORT ); -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data); *tmp = data &0xFF ;break ;case 2 : data =ioread32 (fusb300->reg +FUSB300_OFFSET_CXPORT ); -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data); *tmp = data &0xFF ; *(tmp +1 ) = (data >>8 ) &0xFF ;break ;case 3 : data =ioread32 (fusb300->reg +FUSB300_OFFSET_CXPORT ); -printk (KERN_DEBUG " 0x%x\n" , data); +pr_debug (" 0x%x\n" , data); *tmp = data &0xFF ; *(tmp +1 ) = (data >>8 ) &0xFF ; *(tmp +2 ) = (data >>16 ) &0xFF ;@@ -610,7 +610,7 @@ static void fusb300_rdfifo(struct fusb300_ep *ep, req->req.actual += length;if (req->req.actual > req->req.length) -printk (KERN_DEBUG "req->req.actual > req->req.length\n" ); +pr_debug ("req->req.actual > req->req.length\n" );for (i = (length >>2 ); i >0 ; i--) { data = ioread32(fusb300->reg +@@ -649,7 +649,7 @@ static void fusb300_rdfifo(struct fusb300_ep *ep, reg =ioread32 (fusb300->reg +FUSB300_OFFSET_IGR1 ); reg &=FUSB300_IGR1_SYNF0_EMPTY_INT ;if (i) -printk (KERN_INFO "sync fifo is not empty!\n" ); +pr_info ("sync fifo is not empty!\n" ); i++; }while (!reg); }@@ -677,7 +677,7 @@ static u8 fusb300_get_cxstall(struct fusb300 *fusb300)static void request_error (struct fusb300 *fusb300) {fusb300_set_cxstall (fusb300); -printk (KERN_DEBUG "request error!!\n" ); +pr_debug ("request error!!\n" ); }static void get_status (struct fusb300 *fusb300,struct usb_ctrlrequest *ctrl)@@ -999,7 +999,7 @@ static void check_device_mode(struct fusb300 *fusb300) fusb300->gadget.speed =USB_SPEED_UNKNOWN ;break ; } -printk (KERN_INFO "dev_mode = %d\n" , (reg &FUSB300_GCR_DEVEN_MSK )); +pr_info ("dev_mode = %d\n" , (reg &FUSB300_GCR_DEVEN_MSK )); }@@ -1076,14 +1076,14 @@ static irqreturn_t fusb300_irq(int irq, void *_fusb300)if (int_grp1 &FUSB300_IGR1_WARM_RST_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_WARM_RST_INT ); -printk (KERN_INFO "fusb300_warmreset\n" ); +pr_info ("fusb300_warmreset\n" );fusb300_reset (); }if (int_grp1 &FUSB300_IGR1_HOT_RST_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_HOT_RST_INT ); -printk (KERN_INFO "fusb300_hotreset\n" ); +pr_info ("fusb300_hotreset\n" );fusb300_reset (); }@@ -1097,13 +1097,13 @@ static irqreturn_t fusb300_irq(int irq, void *_fusb300)if (int_grp1 &FUSB300_IGR1_CX_COMABT_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_CX_COMABT_INT ); -printk (KERN_INFO "fusb300_ep0abt\n" ); +pr_info ("fusb300_ep0abt\n" ); }if (int_grp1 &FUSB300_IGR1_VBUS_CHG_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_VBUS_CHG_INT ); -printk (KERN_INFO "fusb300_vbus_change\n" ); +pr_info ("fusb300_vbus_change\n" ); }if (int_grp1 &FUSB300_IGR1_U3_EXIT_FAIL_INT ) {@@ -1134,25 +1134,25 @@ static irqreturn_t fusb300_irq(int irq, void *_fusb300)if (int_grp1 &FUSB300_IGR1_U3_EXIT_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_U3_EXIT_INT ); -printk (KERN_INFO "FUSB300_IGR1_U3_EXIT_INT\n" ); +pr_info ("FUSB300_IGR1_U3_EXIT_INT\n" ); }if (int_grp1 &FUSB300_IGR1_U2_EXIT_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_U2_EXIT_INT ); -printk (KERN_INFO "FUSB300_IGR1_U2_EXIT_INT\n" ); +pr_info ("FUSB300_IGR1_U2_EXIT_INT\n" ); }if (int_grp1 &FUSB300_IGR1_U1_EXIT_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_U1_EXIT_INT ); -printk (KERN_INFO "FUSB300_IGR1_U1_EXIT_INT\n" ); +pr_info ("FUSB300_IGR1_U1_EXIT_INT\n" ); }if (int_grp1 &FUSB300_IGR1_U3_ENTRY_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_U3_ENTRY_INT ); -printk (KERN_INFO "FUSB300_IGR1_U3_ENTRY_INT\n" ); +pr_info ("FUSB300_IGR1_U3_ENTRY_INT\n" );fusb300_enable_bit (fusb300,FUSB300_OFFSET_SSCR1 ,FUSB300_SSCR1_GO_U3_DONE ); }@@ -1160,31 +1160,31 @@ static irqreturn_t fusb300_irq(int irq, void *_fusb300)if (int_grp1 &FUSB300_IGR1_U2_ENTRY_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_U2_ENTRY_INT ); -printk (KERN_INFO "FUSB300_IGR1_U2_ENTRY_INT\n" ); +pr_info ("FUSB300_IGR1_U2_ENTRY_INT\n" ); }if (int_grp1 &FUSB300_IGR1_U1_ENTRY_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_U1_ENTRY_INT ); -printk (KERN_INFO "FUSB300_IGR1_U1_ENTRY_INT\n" ); +pr_info ("FUSB300_IGR1_U1_ENTRY_INT\n" ); }if (int_grp1 &FUSB300_IGR1_RESM_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_RESM_INT ); -printk (KERN_INFO "fusb300_resume\n" ); +pr_info ("fusb300_resume\n" ); }if (int_grp1 &FUSB300_IGR1_SUSP_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_SUSP_INT ); -printk (KERN_INFO "fusb300_suspend\n" ); +pr_info ("fusb300_suspend\n" ); }if (int_grp1 &FUSB300_IGR1_HS_LPM_INT ) {fusb300_clear_int (fusb300,FUSB300_OFFSET_IGR1 ,FUSB300_IGR1_HS_LPM_INT ); -printk (KERN_INFO "fusb300_HS_LPM_INT\n" ); +pr_info ("fusb300_HS_LPM_INT\n" ); }if (int_grp1 &FUSB300_IGR1_DEV_MODE_CHG_INT ) {@@ -1195,11 +1195,11 @@ static irqreturn_t fusb300_irq(int irq, void *_fusb300)if (int_grp1 &FUSB300_IGR1_CX_COMFAIL_INT ) {fusb300_set_cxstall (fusb300); -printk (KERN_INFO "fusb300_ep0fail\n" ); +pr_info ("fusb300_ep0fail\n" ); }if (int_grp1 &FUSB300_IGR1_CX_SETUP_INT ) { -printk (KERN_INFO "fusb300_ep0setup\n" ); +pr_info ("fusb300_ep0setup\n" );if (setup_packet (fusb300, &ctrl)) {spin_unlock (&fusb300->lock);if (fusb300->driver->setup (&fusb300->gadget, &ctrl) <0 )@@ -1209,16 +1209,16 @@ static irqreturn_t fusb300_irq(int irq, void *_fusb300) }if (int_grp1 &FUSB300_IGR1_CX_CMDEND_INT ) -printk (KERN_INFO "fusb300_cmdend\n" ); +pr_info ("fusb300_cmdend\n" );if (int_grp1 &FUSB300_IGR1_CX_OUT_INT ) { -printk (KERN_INFO "fusb300_cxout\n" ); +pr_info ("fusb300_cxout\n" );fusb300_ep0out (fusb300); }if (int_grp1 &FUSB300_IGR1_CX_IN_INT ) { -printk (KERN_INFO "fusb300_cxin\n" ); +pr_info ("fusb300_cxin\n" );fusb300_ep0in (fusb300); }drivers/usb/gadget/udc/goku_udc.c +1
-1@@ -1748,7 +1748,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)int retval;if (!pdev->irq) { -printk (KERN_ERR "Check PCI %s IRQ setup!\n" ,pci_name (pdev)); +pr_err ("Check PCI %s IRQ setup!\n" ,pci_name (pdev)); retval = -ENODEV ; goto err; }drivers/usb/gadget/udc/r8a66597-udc.h +1
-1@@ -247,7 +247,7 @@ static inline u16 get_xtal_from_pdata(struct r8a66597_platdata *pdata) clock =XTAL48 ;break ;default : -printk (KERN_ERR "r8a66597: platdata clock is wrong.\n" ); +pr_err ("r8a66597: platdata clock is wrong.\n" );break ; }Signature · 1 line
2.11.0
Signature · 2 lines
Thanks, Peter Chen