parport: fix if-statement empty body warnings
Subsystems (2)
Sudip Mukherjee
maintainerPATCH 1/11 parport: fix if-statement empty body warnings
From: Joe Perches <[email protected]>
Eliminate warnings by using pr_debug which is the more typical kernel debugging style and also enable dynamic_debug on these outputs.
Miscellaneous:
o A few messages were logged at KERN_INFO when enabled, now KERN_DEBUG
o Convert %d/%d to %zd/%zu to avoid compilation warnings
--- drivers/parport/ieee1284.c | 90 ++++++++++++++++-------------------------- drivers/parport/ieee1284_ops.c | 67 +++++++++++-------------------- 2 files changed, 57 insertions(+), 100 deletions(-)
drivers/parport/ieee1284.c +34 -56
@@ -31,12 +31,6 @@#undef DEBUG/* Don't want a garbled console */ #endif -#ifdef DEBUG -#define DPRINTK(stuff...) printk (stuff) -#else -#define DPRINTK(stuff...) -#endif -/* Make parport_wait_peripheral wake up. * It will be useful to call this from an interrupt handler. */ static void parport_ieee1284_wakeup (struct parport *port)
@@ -258,12 +252,11 @@ static void parport_ieee1284_terminate (struct parport *port)PARPORT_STATUS_PAPEROUT , PARPORT_STATUS_PAPEROUT);if (r) -DPRINTK (KERN_INFO "%s: Timeout at event 49\n" , +pr_debug ("%s: Timeout at event 49\n" , port->name);parport_data_forward (port); -DPRINTK (KERN_DEBUG "%s: ECP direction: forward\n" , - port->name); +pr_debug ("%s: ECP direction: forward\n" , port->name); port->ieee1284.phase =IEEE1284_PH_FWD_IDLE ; }
@@ -281,8 +274,7 @@ static void parport_ieee1284_terminate (struct parport *port)/* Event 24: nAck goes low */ r =parport_wait_peripheral (port,PARPORT_STATUS_ACK ,0 );if (r) -DPRINTK (KERN_INFO "%s: Timeout at event 24\n" , - port->name); +pr_debug ("%s: Timeout at event 24\n" , port->name);/* Event 25: Set nAutoFd low */ parport_frob_control (port,
@@ -294,8 +286,7 @@ static void parport_ieee1284_terminate (struct parport *port)PARPORT_STATUS_ACK , PARPORT_STATUS_ACK);if (r) -DPRINTK (KERN_INFO "%s: Timeout at event 27\n" , - port->name); +pr_debug ("%s: Timeout at event 27\n" , port->name);/* Event 29: Set nAutoFd high */ parport_frob_control (port,PARPORT_CONTROL_AUTOFD ,0 );
@@ -304,8 +295,7 @@ static void parport_ieee1284_terminate (struct parport *port) port->ieee1284.mode =IEEE1284_MODE_COMPAT ; port->ieee1284.phase =IEEE1284_PH_FWD_IDLE ; -DPRINTK (KERN_DEBUG "%s: In compatibility (forward idle) mode\n" , - port->name); + pr_debug("%s: In compatibility (forward idle) mode\n", port->name); }#endif /* IEEE1284 support */
@@ -406,8 +396,7 @@ int parport_negotiate (struct parport *port, int mode)PARPORT_CONTROL_SELECT |PARPORT_CONTROL_AUTOFD , PARPORT_CONTROL_SELECT); -DPRINTK (KERN_DEBUG -"%s: Peripheral not IEEE1284 compliant (0x%02X)\n" , +pr_debug ("%s: Peripheral not IEEE1284 compliant (0x%02X)\n" , port->name,parport_read_status (port)); port->ieee1284.phase =IEEE1284_PH_FWD_IDLE ;return -1 ;/* Not IEEE1284 compliant */
@@ -430,8 +419,7 @@ int parport_negotiate (struct parport *port, int mode) PARPORT_STATUS_ACK, PARPORT_STATUS_ACK)) {/* This shouldn't really happen with a compliant device. */ -DPRINTK (KERN_DEBUG -"%s: Mode 0x%02x not supported? (0x%02x)\n" , +pr_debug ("%s: Mode 0x%02x not supported? (0x%02x)\n" , port->name, mode, port->ops->read_status (port));parport_ieee1284_terminate (port);return 1 ;
@@ -442,7 +430,7 @@ int parport_negotiate (struct parport *port, int mode)/* xflag should be high for all modes other than nibble (0). */ if (mode && !xflag) {/* Mode not supported. */ -DPRINTK (KERN_DEBUG "%s: Mode 0x%02x rejected by peripheral\n" , +pr_debug ("%s: Mode 0x%02x rejected by peripheral\n" , port->name, mode);parport_ieee1284_terminate (port);return 1 ;
@@ -463,9 +451,7 @@ int parport_negotiate (struct parport *port, int mode)/* Event 52: nAck goes low */ if (parport_wait_peripheral (port,PARPORT_STATUS_ACK ,0 )) {/* This peripheral is _very_ slow. */ -DPRINTK (KERN_DEBUG -"%s: Event 52 didn't happen\n" , - port->name); +pr_debug ("%s: Event 52 didn't happen\n" , port->name);parport_ieee1284_terminate (port);return 1 ; }
@@ -481,10 +467,9 @@ int parport_negotiate (struct parport *port, int mode) PARPORT_STATUS_ACK)) {/* This shouldn't really happen with a compliant * device. */ -DPRINTK (KERN_DEBUG -"%s: Mode 0x%02x not supported? (0x%02x)\n" , +pr_debug ("%s: Mode 0x%02x not supported? (0x%02x)\n" , port->name, mode, - port->ops->read_status (port)); + port->ops->read_status (port));parport_ieee1284_terminate (port);return 1 ; }
@@ -495,8 +480,8 @@ int parport_negotiate (struct parport *port, int mode)/* xflag should be high. */ if (!xflag) {/* Extended mode not supported. */ -DPRINTK (KERN_DEBUG "%s: Extended mode 0x%02x not " -"supported\n" , port->name, mode); +pr_debug ("%s: Extended mode 0x%02x not supported\n" , + port->name, mode);parport_ieee1284_terminate (port);return 1 ; }
@@ -505,7 +490,7 @@ int parport_negotiate (struct parport *port, int mode) }/* Mode is supported */ -DPRINTK (KERN_DEBUG "%s: In mode 0x%02x\n" , port->name, mode); +pr_debug ("%s: In mode 0x%02x\n" , port->name, mode); port->ieee1284.mode = mode;/* But ECP is special */
@@ -522,13 +507,11 @@ int parport_negotiate (struct parport *port, int mode)PARPORT_STATUS_PAPEROUT , PARPORT_STATUS_PAPEROUT);if (r) { -DPRINTK (KERN_INFO "%s: Timeout at event 31\n" , - port->name); +pr_debug ("%s: Timeout at event 31\n" , port->name); } port->ieee1284.phase =IEEE1284_PH_FWD_IDLE ; -DPRINTK (KERN_DEBUG "%s: ECP direction: forward\n" , - port->name); +pr_debug ("%s: ECP direction: forward\n" , port->name); }else switch (mode) {case IEEE1284_MODE_NIBBLE :case IEEE1284_MODE_BYTE :
@@ -573,7 +556,7 @@ void parport_ieee1284_interrupt (void *handle)if (port->ieee1284.phase ==IEEE1284_PH_REV_IDLE ) {/* An interrupt in this phase means that data * is now available. */ -DPRINTK (KERN_DEBUG "%s: Data available\n" , port->name); +pr_debug ("%s: Data available\n" , port->name);parport_ieee1284_ack_data_avail (port); }#endif /* IEEE1284 support */
@@ -617,13 +600,12 @@ ssize_t parport_write (struct parport *port, const void *buffer, size_t len)parport_negotiate (port,IEEE1284_MODE_COMPAT );/* fall through */ case IEEE1284_MODE_COMPAT : -DPRINTK (KERN_DEBUG "%s: Using compatibility mode\n" , - port->name); +pr_debug ("%s: Using compatibility mode\n" , port->name); fn = port->ops->compat_write_data;break ;case IEEE1284_MODE_EPP : -DPRINTK (KERN_DEBUG "%s: Using EPP mode\n" , port->name); +pr_debug ("%s: Using EPP mode\n" , port->name);if (addr) { fn = port->ops->epp_write_addr; }else {
@@ -631,8 +613,7 @@ ssize_t parport_write (struct parport *port, const void *buffer, size_t len) }break ;case IEEE1284_MODE_EPPSWE : -DPRINTK (KERN_DEBUG "%s: Using software-emulated EPP mode\n" , - port->name); +pr_debug ("%s: Using software-emulated EPP mode\n" , port->name);if (addr) { fn = parport_ieee1284_epp_write_addr; }else {
@@ -641,7 +622,7 @@ ssize_t parport_write (struct parport *port, const void *buffer, size_t len)break ;case IEEE1284_MODE_ECP :case IEEE1284_MODE_ECPRLE : -DPRINTK (KERN_DEBUG "%s: Using ECP mode\n" , port->name); +pr_debug ("%s: Using ECP mode\n" , port->name);if (addr) { fn = port->ops->ecp_write_addr; }else {
@@ -650,8 +631,7 @@ ssize_t parport_write (struct parport *port, const void *buffer, size_t len)break ;case IEEE1284_MODE_ECPSWE : -DPRINTK (KERN_DEBUG "%s: Using software-emulated ECP mode\n" , - port->name); +pr_debug ("%s: Using software-emulated ECP mode\n" , port->name);/* The caller has specified that it must be emulated, * even if we have ECP hardware! */ if (addr) {
@@ -662,13 +642,13 @@ ssize_t parport_write (struct parport *port, const void *buffer, size_t len)break ;default : -DPRINTK (KERN_DEBUG "%s: Unknown mode 0x%02x\n" , port->name, - port->ieee1284.mode); +pr_debug ("%s: Unknown mode 0x%02x\n" , + port->name, port->ieee1284.mode); return -ENOSYS; } retval = (*fn) (port, buffer, len,0 ); -DPRINTK (KERN_DEBUG "%s: wrote %d/%d bytes\n" , port->name, retval, len); +pr_debug ("%s: wrote %zd/%zu bytes\n" , port->name, retval, len);return retval;#endif /* IEEE1284 support */ }
@@ -715,7 +695,7 @@ ssize_t parport_read (struct parport *port, void *buffer, size_t len)if ((port->physport->modes &PARPORT_MODE_TRISTATE ) && !parport_negotiate (port,IEEE1284_MODE_BYTE )) {/* got into BYTE mode OK */ -DPRINTK (KERN_DEBUG "%s: Using byte mode\n" , port->name); +pr_debug ("%s: Using byte mode\n" , port->name); fn = port->ops->byte_read_data;break ; }
@@ -724,17 +704,17 @@ ssize_t parport_read (struct parport *port, void *buffer, size_t len) }/* fall through - to NIBBLE */ case IEEE1284_MODE_NIBBLE : -DPRINTK (KERN_DEBUG "%s: Using nibble mode\n" , port->name); +pr_debug ("%s: Using nibble mode\n" , port->name); fn = port->ops->nibble_read_data;break ;case IEEE1284_MODE_BYTE : -DPRINTK (KERN_DEBUG "%s: Using byte mode\n" , port->name); +pr_debug ("%s: Using byte mode\n" , port->name); fn = port->ops->byte_read_data;break ;case IEEE1284_MODE_EPP : -DPRINTK (KERN_DEBUG "%s: Using EPP mode\n" , port->name); +pr_debug ("%s: Using EPP mode\n" , port->name);if (addr) { fn = port->ops->epp_read_addr; }else {
@@ -742,8 +722,7 @@ ssize_t parport_read (struct parport *port, void *buffer, size_t len) }break ;case IEEE1284_MODE_EPPSWE : -DPRINTK (KERN_DEBUG "%s: Using software-emulated EPP mode\n" , - port->name); +pr_debug ("%s: Using software-emulated EPP mode\n" , port->name);if (addr) { fn = parport_ieee1284_epp_read_addr; }else {
@@ -752,19 +731,18 @@ ssize_t parport_read (struct parport *port, void *buffer, size_t len)break ;case IEEE1284_MODE_ECP :case IEEE1284_MODE_ECPRLE : -DPRINTK (KERN_DEBUG "%s: Using ECP mode\n" , port->name); +pr_debug ("%s: Using ECP mode\n" , port->name); fn = port->ops->ecp_read_data;break ;case IEEE1284_MODE_ECPSWE : -DPRINTK (KERN_DEBUG "%s: Using software-emulated ECP mode\n" , - port->name); +pr_debug ("%s: Using software-emulated ECP mode\n" , port->name); fn = parport_ieee1284_ecp_read_data;break ;default : -DPRINTK (KERN_DEBUG "%s: Unknown mode 0x%02x\n" , port->name, - port->physport->ieee1284.mode); +pr_debug ("%s: Unknown mode 0x%02x\n" , + port->name, port->physport->ieee1284.mode);return -ENOSYS ; }
drivers/parport/ieee1284_ops.c +23 -44
183 lines not on this page · raw message
Signature · 1 line
2.11.0
Sudip Mukherjee
maintainerPATCH 2/11 parport: Convert printk(KERN_<LEVEL> to pr_<level>(
From: Joe Perches <[email protected]>
Use the more common kernel style.
Miscellanea:
o Coalesce formats
o Realign arguments
--- drivers/parport/daisy.c | 6 +- drivers/parport/ieee1284.c | 4 +- drivers/parport/ieee1284_ops.c | 3 +- drivers/parport/parport_amiga.c | 2 +- drivers/parport/parport_atari.c | 2 +- drivers/parport/parport_cs.c | 6 +- drivers/parport/parport_gsc.c | 7 +- drivers/parport/parport_ip32.c | 25 +++--- drivers/parport/parport_mfc3.c | 2 +- drivers/parport/parport_pc.c | 166 +++++++++++++++++---------------------- drivers/parport/parport_sunbpp.c | 2 +- drivers/parport/probe.c | 7 +- drivers/parport/share.c | 24 +++--- 13 files changed, 110 insertions(+), 146 deletions(-)
drivers/parport/daisy.c +2 -4
@@ -145,8 +145,7 @@ int parport_daisy_init(struct parport *port) ((num_ports = num_mux_ports(port)) == 2 || num_ports == 4)) {/* Leave original as port zero. */ port->muxport =0 ; -printk (KERN_INFO -"%s: 1st (default) port of %d-way multiplexor\n" , +pr_info ("%s: 1st (default) port of %d-way multiplexor\n" , port->name, num_ports);for (i =1 ; i < num_ports; i++) {/* Clone the port. */
@@ -159,8 +158,7 @@ int parport_daisy_init(struct parport *port)continue ; } -printk (KERN_INFO -"%s: %d%s port of %d-way multiplexor on %s\n" , +pr_info ("%s: %d%s port of %d-way multiplexor on %s\n" , extra->name, i +1 , th[i +1 ], num_ports, port->name);
drivers/parport/ieee1284.c +2 -2
@@ -319,7 +319,7 @@ int parport_negotiate (struct parport *port, int mode)#ifndef CONFIG_PARPORT_1284 if (mode ==IEEE1284_MODE_COMPAT )return 0 ; -printk (KERN_ERR "parport: IEEE1284 not supported in this kernel\n" ); +pr_err ("parport: IEEE1284 not supported in this kernel\n" );return -1 ;#else int m = mode & ~IEEE1284_ADDR ;
@@ -674,7 +674,7 @@ ssize_t parport_write (struct parport *port, const void *buffer, size_t len)ssize_t parport_read (struct parport *port,void *buffer,size_t len) {#ifndef CONFIG_PARPORT_1284 -printk (KERN_ERR "parport: IEEE1284 not supported in this kernel\n" ); +pr_err ("parport: IEEE1284 not supported in this kernel\n" );return -ENODEV ;#else int mode = port->physport->ieee1284.mode;
drivers/parport/ieee1284_ops.c +1 -2
@@ -579,8 +579,7 @@ size_t parport_ieee1284_ecp_read_data (struct parport *port,pr_debug ("ECP read timed out at 45\n" );if (command) -printk (KERN_WARNING -"%s: command ignored (%02x)\n" , +pr_warn ("%s: command ignored (%02x)\n" , port->name, byte);break ;
drivers/parport/parport_amiga.c +1 -1
@@ -212,7 +212,7 @@ static int __init amiga_parallel_probe(struct platform_device *pdev)if (err) goto out_irq; -printk (KERN_INFO "%s: Amiga built-in port using irq\n" , p->name); +pr_info ("%s: Amiga built-in port using irq\n" , p->name);/* XXX: set operating mode */ parport_announce_port (p);
drivers/parport/parport_atari.c +1 -1
@@ -200,7 +200,7 @@ static int __init parport_atari_init(void) } this_port = p; -printk (KERN_INFO "%s: Atari built-in port using irq\n" , p->name); +pr_info ("%s: Atari built-in port using irq\n" , p->name);parport_announce_port (p);return 0 ;
drivers/parport/parport_cs.c +2 -4
@@ -142,10 +142,8 @@ static int parport_config(struct pcmcia_device *link) link->irq,PARPORT_DMA_NONE , &link->dev, IRQF_SHARED);if (p ==NULL ) { -printk (KERN_NOTICE "parport_cs: parport_pc_probe_port() at " -"0x%3x, irq %u failed\n" , - (unsigned int ) link->resource[0 ]->start, - link->irq); +pr_notice ("parport_cs: parport_pc_probe_port() at 0x%3x, irq %u failed\n" , + (unsigned int )link->resource[0 ]->start, link->irq); goto failed; }
drivers/parport/parport_gsc.c +3 -4
@@ -282,7 +282,7 @@ struct parport *parport_gsc_probe_port(unsigned long base, p->size = (p->modes &PARPORT_MODE_EPP )?8 :3 ; p->private_data = priv; -printk (KERN_INFO "%s: PC-style at 0x%lx" , p->name, p->base); +pr_info ("%s: PC-style at 0x%lx" , p->name, p->base); p->irq = irq;if (p->irq ==PARPORT_IRQ_AUTO ) { p->irq =PARPORT_IRQ_NONE ;
@@ -315,8 +315,7 @@ struct parport *parport_gsc_probe_port(unsigned long base,if (p->irq !=PARPORT_IRQ_NONE ) {if (request_irq (p->irq, parport_irq_handler,0 , p->name, p)) { -printk (KERN_WARNING "%s: irq %d in use, " -"resorting to polled operation\n" , +pr_warn ("%s: irq %d in use, resorting to polled operation\n" , p->name, p->irq); p->irq =PARPORT_IRQ_NONE ; p->dma =PARPORT_DMA_NONE ;
@@ -347,7 +346,7 @@ static int __init parport_init_chip(struct parisc_device *dev)unsigned long port;if (!dev->irq) { -printk (KERN_WARNING "IRQ not found for parallel device at 0x%llx\n" , +pr_warn ("IRQ not found for parallel device at 0x%llx\n" , (unsigned long long )dev->hpa.start);return -ENODEV ; }
drivers/parport/parport_ip32.c +10 -15
@@ -1337,9 +1337,8 @@ static unsigned int parport_ip32_fwp_wait_interrupt(struct parport *p) ecr =parport_ip32_read_econtrol (p);if ((ecr &ECR_F_EMPTY ) && !(ecr &ECR_SERVINTR ) && !lost_interrupt) { - printk(KERN_WARNING PPIP32 -"%s: lost interrupt in %s\n" , - p->name, __func__); +pr_warn (PPIP32 "%s: lost interrupt in %s\n" , + p->name, __func__); lost_interrupt =1 ; } }
@@ -1643,8 +1642,8 @@ static size_t parport_ip32_compat_write_data(struct parport *p, DSR_nBUSY | DSR_nFAULT)) {/* Avoid to flood the logs */ if (ready_before) - printk(KERN_INFO PPIP32 "%s: not ready in %s\n", - p->name, __func__); +pr_info (PPIP32 "%s: not ready in %s\n" , + p->name, __func__); ready_before =0 ; goto stop; }
@@ -1724,8 +1723,8 @@ static size_t parport_ip32_ecp_write_data(struct parport *p, DSR_nBUSY | DSR_nFAULT)) {/* Avoid to flood the logs */ if (ready_before) - printk(KERN_INFO PPIP32 "%s: not ready in %s\n", - p->name, __func__); +pr_info (PPIP32 "%s: not ready in %s\n" , + p->name, __func__); ready_before =0 ; goto stop; }
@@ -2064,8 +2063,7 @@ static __init struct parport *parport_ip32_probe_port(void) p->modes |=PARPORT_MODE_TRISTATE ;if (!parport_ip32_fifo_supported (p)) { - printk(KERN_WARNING PPIP32 - "%s: error: FIFO disabled\n", p->name); +pr_warn (PPIP32 "%s: error: FIFO disabled\n" , p->name);/* Disable hardware modes depending on a working FIFO. */ features &= ~PARPORT_IP32_ENABLE_SPP ; features &= ~PARPORT_IP32_ENABLE_ECP ;
@@ -2077,8 +2075,7 @@ static __init struct parport *parport_ip32_probe_port(void)if (features &PARPORT_IP32_ENABLE_IRQ ) {int irq =MACEISA_PARALLEL_IRQ ;if (request_irq (irq, parport_ip32_interrupt,0 , p->name, p)) { - printk(KERN_WARNING PPIP32 - "%s: error: IRQ disabled\n", p->name); +pr_warn (PPIP32 "%s: error: IRQ disabled\n" , p->name);/* DMA cannot work without interrupts. */ features &= ~PARPORT_IP32_ENABLE_DMA ; }else {
@@ -2091,8 +2088,7 @@ static __init struct parport *parport_ip32_probe_port(void)/* Allocate DMA resources */ if (features &PARPORT_IP32_ENABLE_DMA ) {if (parport_ip32_dma_register ()) - printk(KERN_WARNING PPIP32 -"%s: error: DMA disabled\n" , p->name); +pr_warn (PPIP32 "%s: error: DMA disabled\n" , p->name);else {pr_probe (p,"DMA support enabled\n" ); p->dma =0 ;/* arbitrary value != PARPORT_DMA_NONE */
@@ -2134,8 +2130,7 @@ static __init struct parport *parport_ip32_probe_port(void)parport_ip32_dump_state (p,"end init" ,0 );/* Print out what we found */ -printk (KERN_INFO "%s: SGI IP32 at 0x%lx (0x%lx)" , - p->name, p->base, p->base_hi); +pr_info ("%s: SGI IP32 at 0x%lx (0x%lx)" , p->name, p->base, p->base_hi);if (p->irq !=PARPORT_IRQ_NONE )printk (", irq %d" , p->irq);printk (" [" );
drivers/parport/parport_mfc3.c +1 -1
@@ -325,7 +325,7 @@ static int __init parport_mfc3_init(void) p->dev = &z->dev; this_port[pias++] = p; -printk (KERN_INFO "%s: Multiface III port using irq\n" , p->name); +pr_info ("%s: Multiface III port using irq\n" , p->name);/* XXX: set operating mode */ p->private_data = (void *)piabase;
drivers/parport/parport_pc.c +70 -96
386 lines not on this page · raw message
drivers/parport/parport_sunbpp.c +1 -1
@@ -314,7 +314,7 @@ static int bpp_probe(struct platform_device *op) value_tcr &= ~P_TCR_DIR ;sbus_writeb (value_tcr, ®s->p_tcr); -printk (KERN_INFO "%s: sunbpp at 0x%lx\n" , p->name, p->base); +pr_info ("%s: sunbpp at 0x%lx\n" , p->name, p->base);dev_set_drvdata (&op->dev, p);
drivers/parport/probe.c +4 -3
@@ -38,7 +38,7 @@ static void pretty_print(struct parport *port, int device) {struct parport_device_info *info = &port->probe_info[device +1 ]; -printk (KERN_INFO "%s" , port->name); +pr_info ("%s" , port->name);if (device >=0 )printk (" (addr %d)" , device);
@@ -58,7 +58,7 @@ static void parse_data(struct parport *port, int device, char *str)struct parport_device_info *info = &port->probe_info[device +1 ];if (!txt) { -printk (KERN_WARNING "%s probe: memory squeeze\n" , port->name); +pr_warn ("%s probe: memory squeeze\n" , port->name);return ; }strcpy (txt, str);
@@ -98,7 +98,8 @@ static void parse_data(struct parport *port, int device, char *str) goto rock_on; } } -printk (KERN_WARNING "%s probe: warning, class '%s' not understood.\n" , port->name, sep); +pr_warn ("%s probe: warning, class '%s' not understood\n" , + port->name, sep); info->class =PARPORT_CLASS_OTHER ; }else if (!strcmp (p,"CMD" ) || !strcmp (p,"COMMAND SET" )) {
drivers/parport/share.c +12 -12
@@ -554,8 +554,8 @@ void parport_announce_port(struct parport *port)#endif if (!port->dev) -printk (KERN_WARNING "%s: fix this legacy no-device port driver!\n" , - port->name); +pr_warn ("%s: fix this legacy no-device port driver!\n" , + port->name);parport_proc_register (port);mutex_lock (®istration_lock);
@@ -727,7 +727,8 @@ parport_register_device(struct parport *port, const char *name,if (flags &PARPORT_DEV_LURK ) {if (!pf || !kf) { -printk (KERN_INFO "%s: refused to register lurking device (%s) without callbacks\n" , port->name, name); +pr_info ("%s: refused to register lurking device (%s) without callbacks\n" , + port->name, name);return NULL ; } }
@@ -996,7 +997,7 @@ void parport_unregister_device(struct pardevice *dev)#ifdef PARPORT_PARANOID if (!dev) { -printk (KERN_ERR "parport_unregister_device: passed NULL\n" ); +pr_err ("%s: passed NULL\n" , __func__);return ; }#endif
@@ -1137,8 +1138,7 @@ int parport_claim(struct pardevice *dev)unsigned long flags;if (port->cad == dev) { -printk (KERN_INFO "%s: %s already owner\n" , - dev->port->name,dev->name); +pr_info ("%s: %s already owner\n" , dev->port->name, dev->name);return 0 ; }
@@ -1158,9 +1158,8 @@ int parport_claim(struct pardevice *dev)* I think we'll actually deadlock rather than * get here, but just in case.. */ -printk (KERN_WARNING -"%s: %s released port when preempted!\n" , - port->name, oldcad->name); +pr_warn ("%s: %s released port when preempted!\n" , + port->name, oldcad->name);if (port->cad) goto blocked; }
@@ -1320,8 +1319,8 @@ void parport_release(struct pardevice *dev)write_lock_irqsave (&port->cad_lock, flags);if (port->cad != dev) {write_unlock_irqrestore (&port->cad_lock, flags); -printk (KERN_WARNING "%s: %s tried to release parport when not owner\n" , - port->name, dev->name); +pr_warn ("%s: %s tried to release parport when not owner\n" , + port->name, dev->name);return ; }
@@ -1361,7 +1360,8 @@ void parport_release(struct pardevice *dev)if (dev->port->cad)/* racy but no matter */ return ; }else { -printk (KERN_ERR "%s: don't know how to wake %s\n" , port->name, pd->name); +pr_err ("%s: don't know how to wake %s\n" , + port->name, pd->name); } }
Signature · 1 line
2.11.0
Sudip Mukherjee
maintainerPATCH 3/11 parport: Use more comon logging styles
In reply to Sudip MukherjeeFrom: Joe Perches <[email protected]>
Some of the logging can be poorly formatted because of unexpected line breaks given printks without KERN_CONT that should be pr_cont.
Miscellanea:
o Remove unnecessary spaces between function name and open parenthesis
o Convert bare printks to pr_<level> where appropriate
o Convert embedded function names to use %s, __func__
o Coalesce formats
o Realign arguments
o Use do {} while (0) in a macro and not a bare if
---
Joe has given the rationale to use "KERN_DEBUG" at:
https://lore.kernel.org/lkml/[email protected]/
drivers/parport/parport_gsc.c | 10 ++--- drivers/parport/parport_gsc.h | 21 +++++----- drivers/parport/parport_ip32.c | 92 ++++++++++++++++++++++-------------------- drivers/parport/parport_pc.c | 62 +++++++++++++--------------- drivers/parport/probe.c | 27 +++++-------- drivers/parport/share.c | 13 +++--- 6 files changed, 108 insertions(+), 117 deletions(-)
drivers/parport/parport_gsc.c +5 -5
@@ -238,14 +238,14 @@ struct parport *parport_gsc_probe_port(unsigned long base, priv =kzalloc (sizeof (struct parport_gsc_private ),GFP_KERNEL );if (!priv) { -printk (KERN_DEBUG "parport (0x%lx): no memory!\n" , base); +printk (KERN_DEBUG "parport (0x%lx): no memory!\n" , base);return NULL ; } ops =kmemdup (&parport_gsc_ops,sizeof (struct parport_operations ),GFP_KERNEL );if (!ops) { -printk (KERN_DEBUG "parport (0x%lx): no memory for ops!\n" , - base); +printk (KERN_DEBUG "parport (0x%lx): no memory for ops!\n" , + base);kfree (priv);return NULL ; }
@@ -359,11 +359,11 @@ static int __init parport_init_chip(struct parisc_device *dev)if (boot_cpu_data.cpu_type > pcxt && !pdc_add_valid (port+4 )) {/* Initialize bidirectional-mode (0x10) & data-tranfer-mode #1 (0x20) */ -printk ("%s: initialize bidirectional-mode.\n" , __func__); +pr_info ("%s: initialize bidirectional-mode\n" , __func__);parport_writeb ( (0x10 +0x20 ), port +4 ); }else { -printk ("%s: enhanced parport-modes not supported.\n" , __func__); +pr_info ("%s: enhanced parport-modes not supported\n" , __func__); } p = parport_gsc_probe_port(port, 0, dev->irq,
drivers/parport/parport_gsc.h +10 -11
@@ -71,7 +71,7 @@ struct parport_gsc_private {static inline void parport_gsc_write_data (struct parport *p,unsigned char d) {#ifdef DEBUG_PARPORT -printk (KERN_DEBUG "parport_gsc_write_data(%p,0x%02x)\n" , p, d); +printk (KERN_DEBUG "%s(%p,0x%02x)\n" , __func__, p, d);#endif parport_writeb (d,DATA (p)); }
@@ -80,8 +80,7 @@ static inline unsigned char parport_gsc_read_data(struct parport *p) {unsigned char val =parport_readb (DATA (p));#ifdef DEBUG_PARPORT -printk (KERN_DEBUG "parport_gsc_read_data(%p) = 0x%02x\n" , - p, val); +printk (KERN_DEBUG "%s(%p) = 0x%02x\n" , __func__, p, val);#endif return val; }
@@ -95,9 +94,9 @@ static inline unsigned char __parport_gsc_frob_control(struct parport *p,struct parport_gsc_private *priv = p->physport->private_data;unsigned char ctr = priv->ctr;#ifdef DEBUG_PARPORT -printk (KERN_DEBUG -"__parport_gsc_frob_control(%02x,%02x): %02x -> %02x\n" , - mask, val, ctr, ((ctr & ~mask) ^ val) & priv->ctr_writable); +printk (KERN_DEBUG "%s(%02x,%02x): %02x -> %02x\n" , + __func__, mask, val, + ctr, ((ctr & ~mask) ^ val) & priv->ctr_writable);#endif ctr = (ctr & ~mask) ^ val; ctr &= priv->ctr_writable;/* only write writable bits. */
@@ -126,8 +125,8 @@ static inline void parport_gsc_write_control(struct parport *p,/* Take this out when drivers have adapted to newer interface. */ if (d &0x20 ) { -printk (KERN_DEBUG "%s (%s): use data_reverse for this!\n" , - p->name, p->cad->name); +printk (KERN_DEBUG "%s (%s): use data_reverse for this!\n" , + p->name, p->cad->name);parport_gsc_data_reverse (p); }
@@ -155,9 +154,9 @@ static inline unsigned char parport_gsc_frob_control(struct parport *p,/* Take this out when drivers have adapted to newer interface. */ if (mask &0x20 ) { -printk (KERN_DEBUG "%s (%s): use data_%s for this!\n" , - p->name, p->cad->name, - (val &0x20 ) ?"reverse" :"forward" ); +printk (KERN_DEBUG "%s (%s): use data_%s for this!\n" , + p->name, p->cad->name, + (val &0x20 ) ?"reverse" :"forward" );if (val &0x20 )parport_gsc_data_reverse (p);else
drivers/parport/parport_ip32.c +48 -44
163 lines not on this page · raw message
drivers/parport/parport_pc.c +28 -34
155 lines not on this page · raw message
drivers/parport/probe.c +11 -16
@@ -41,13 +41,13 @@ static void pretty_print(struct parport *port, int device)pr_info ("%s" , port->name);if (device >=0 ) -printk (" (addr %d)" , device); +pr_cont (" (addr %d)" , device); -printk (": %s" , classes[info->class].descr); +pr_cont (": %s" , classes[info->class].descr);if (info->class) -printk (", %s %s" , info->mfr, info->model); +pr_cont (", %s %s" , info->mfr, info->model); -printk ("\n" ); +pr_cont ("\n" ); }static void parse_data (struct parport *port,int device,char *str)
@@ -178,9 +178,8 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer,* just return constant nibble forever. This catches * also those cases. */ if (idlens[0 ] ==0 || idlens[0 ] >0xFFF ) { -printk (KERN_DEBUG "%s: reported broken Device ID" -" length of %#zX bytes\n" , - port->name, idlens[0 ]); +printk (KERN_DEBUG "%s: reported broken Device ID length of %#zX bytes\n" , + port->name, idlens[0 ]);return -EIO ; } numidlens =2 ;
@@ -202,10 +201,8 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer,if (port->physport->ieee1284.phase !=IEEE1284_PH_HBUSY_DAVAIL ) {if (belen != len) { -printk (KERN_DEBUG "%s: Device ID was %zd bytes" -" while device told it would be %d" -" bytes\n" , - port->name, len, belen); +printk (KERN_DEBUG "%s: Device ID was %zd bytes while device told it would be %d bytes\n" , + port->name, len, belen); } goto done; }
@@ -215,11 +212,9 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer,* the first 256 bytes or so that we must have read so * far. */ if (buffer[len-1 ] ==';' ) { -printk (KERN_DEBUG "%s: Device ID reading stopped" -" before device told data not available. " -"Current idlen %u of %u, len bytes %02X %02X\n" , - port->name, current_idlen, numidlens, - length[0 ], length[1 ]); +printk (KERN_DEBUG "%s: Device ID reading stopped before device told data not available. Current idlen %u of %u, len bytes %02X %02X\n" , + port->name, current_idlen, numidlens, + length[0 ], length[1 ]); goto done; } }
drivers/parport/share.c +6 -7
@@ -720,8 +720,7 @@ parport_register_device(struct parport *port, const char *name,if (port->physport->flags &PARPORT_FLAG_EXCL ) {/* An exclusive device is registered. */ -printk (KERN_DEBUG "%s: no more devices allowed\n" , - port->name); +printk (KERN_DEBUG "%s: no more devices allowed\n" , port->name);return NULL ; }
@@ -789,9 +788,8 @@ parport_register_device(struct parport *port, const char *name,if (flags &PARPORT_DEV_EXCL ) {if (port->physport->devices) {spin_unlock (&port->physport->pardevice_lock); -printk (KERN_DEBUG -"%s: cannot grant exclusive access for device %s\n" , - port->name, name); +printk (KERN_DEBUG "%s: cannot grant exclusive access for device %s\n" , + port->name, name); goto out_free_all; } port->flags |=PARPORT_FLAG_EXCL ;
@@ -1259,7 +1257,8 @@ int parport_claim_or_block(struct pardevice *dev) r =parport_claim (dev);if (r == -EAGAIN ) {#ifdef PARPORT_DEBUG_SHARING -printk (KERN_DEBUG "%s: parport_claim() returned -EAGAIN\n" , dev->name); +printk (KERN_DEBUG "%s: parport_claim() returned -EAGAIN\n" , + dev->name);#endif /* * FIXME!!! Use the proper locking for dev->waiting,
@@ -1292,7 +1291,7 @@ int parport_claim_or_block(struct pardevice *dev)if (dev->port->physport->cad != dev)printk (KERN_DEBUG "%s: exiting parport_claim_or_block but %s owns port!\n" , dev->name, dev->port->physport->cad ? - dev->port->physport->cad->name:"nobody" ); + dev->port->physport->cad->name :"nobody" );#endif } dev->waiting =0 ;
Signature · 1 line
2.11.0
Sudip Mukherjee
maintainerPATCH 4/11 parport: daisy: Convert DPRINTK to pr_debug
In reply to Sudip MukherjeeFrom: Joe Perches <[email protected]>
Use a more common logging style.
--- drivers/parport/daisy.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-)
drivers/parport/daisy.c +6 -17
@@ -30,12 +30,6 @@#undef DEBUG -#ifdef DEBUG -#define DPRINTK(stuff...) printk(stuff) -#else -#define DPRINTK(stuff...) -#endif - static struct daisydev { struct daisydev *next; struct parport *port;
@@ -321,8 +315,7 @@ static int cpp_daisy(struct parport *port, int cmd) | PARPORT_STATUS_PAPEROUT | PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) { -DPRINTK (KERN_DEBUG "%s: cpp_daisy: aa5500ff(%02x)\n" , - port->name, s); +pr_debug ("%s: cpp_daisy: aa5500ff(%02x)\n" , port->name, s);return -ENXIO ; }
@@ -332,8 +325,7 @@ static int cpp_daisy(struct parport *port, int cmd) | PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR);if (s != (PARPORT_STATUS_SELECT |PARPORT_STATUS_ERROR )) { -DPRINTK (KERN_DEBUG "%s: cpp_daisy: aa5500ff87(%02x)\n" , - port->name, s); +pr_debug ("%s: cpp_daisy: aa5500ff87(%02x)\n" , port->name, s);return -ENXIO ; }
@@ -368,7 +360,7 @@ static int cpp_mux(struct parport *port, int cmd) s =parport_read_status (port);if (!(s &PARPORT_STATUS_ACK )) { -DPRINTK (KERN_DEBUG "%s: cpp_mux: aa55f00f52ad%02x(%02x)\n" , +pr_debug ("%s: cpp_mux: aa55f00f52ad%02x(%02x)\n" , port->name, cmd, s);return -EIO ; }
@@ -454,8 +446,7 @@ static int assign_addrs(struct parport *port) | PARPORT_STATUS_PAPEROUT | PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) { -DPRINTK (KERN_DEBUG "%s: assign_addrs: aa5500ff(%02x)\n" , - port->name, s); +pr_debug ("%s: assign_addrs: aa5500ff(%02x)\n" , port->name, s);return 0 ; }
@@ -465,8 +456,7 @@ static int assign_addrs(struct parport *port) | PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR);if (s != (PARPORT_STATUS_SELECT |PARPORT_STATUS_ERROR )) { -DPRINTK (KERN_DEBUG "%s: assign_addrs: aa5500ff87(%02x)\n" , - port->name, s); +pr_debug ("%s: assign_addrs: aa5500ff87(%02x)\n" , port->name, s);return 0 ; }
@@ -503,8 +493,7 @@ static int assign_addrs(struct parport *port)parport_write_data (port,0xff );udelay (2 ); detected = numdevs - thisdev; -DPRINTK (KERN_DEBUG "%s: Found %d daisy-chained devices\n" , port->name, - detected); +pr_debug ("%s: Found %d daisy-chained devices\n" , port->name, detected);/* Ask the new devices to introduce themselves. */ deviceid =kmalloc (1024 ,GFP_KERNEL );
Signature · 1 line
2.11.0
Sudip Mukherjee
maintainerPATCH 5/11 parport_amiga: Convert DPRINTK to pr_debug
In reply to Sudip MukherjeeFrom: Joe Perches <[email protected]>
Use a more common logging style.
--- drivers/parport/parport_amiga.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/parport/parport_amiga.c +7 -13
@@ -28,16 +28,10 @@#include <asm/amigaints.h> #undef DEBUG -#ifdef DEBUG -#define DPRINTK printk -#else -#define DPRINTK(x...) do { } while (0) -#endif -static void amiga_write_data (struct parport *p,unsigned char data) { -DPRINTK (KERN_DEBUG "write_data %c\n" ,data); +pr_debug ("write_data %c\n" , data);/* Triggers also /STROBE. This behavior cannot be changed */ ciaa.prb = data;mb ();
@@ -59,13 +53,13 @@ static unsigned char control_amiga_to_pc(unsigned char control)static void amiga_write_control (struct parport *p,unsigned char control) { -DPRINTK (KERN_DEBUG "write_control %02x\n" ,control); +pr_debug ("write_control %02x\n" , control);/* No implementation possible */ }static unsigned char amiga_read_control (struct parport *p) { -DPRINTK (KERN_DEBUG "read_control \n" ); +pr_debug ("read_control\n" );return control_amiga_to_pc (0 ); }
@@ -73,7 +67,7 @@ static unsigned char amiga_frob_control( struct parport *p, unsigned char mask, {unsigned char old; -DPRINTK (KERN_DEBUG "frob_control mask %02x, value %02x\n" ,mask,val); +pr_debug ("frob_control mask %02x, value %02x\n" , mask, val); old =amiga_read_control (p);amiga_write_control (p, (old & ~mask) ^ val);return old;
@@ -99,7 +93,7 @@ static unsigned char amiga_read_status(struct parport *p)unsigned char status; status =status_amiga_to_pc (ciab.pra &7 ); -DPRINTK (KERN_DEBUG "read_status %02x\n" , status); +pr_debug ("read_status %02x\n" , status);return status; }
@@ -115,14 +109,14 @@ static void amiga_disable_irq(struct parport *p)static void amiga_data_forward (struct parport *p) { -DPRINTK (KERN_DEBUG "forward\n" ); +pr_debug ("forward\n" ); ciaa.ddrb =0xff ;/* all pins output */ mb (); }static void amiga_data_reverse (struct parport *p) { -DPRINTK (KERN_DEBUG "reverse\n" ); +pr_debug ("reverse\n" ); ciaa.ddrb =0 ;/* all pins input */ mb (); }
Signature · 1 line
2.11.0
Sudip Mukherjee
maintainerPATCH 6/11 parport_mfc3: Convert DPRINTK to pr_debug
In reply to Sudip MukherjeeFrom: Joe Perches <[email protected]>
Use a more common logging style.
--- drivers/parport/parport_mfc3.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
drivers/parport/parport_mfc3.c +7 -12
@@ -70,11 +70,6 @@#define MAX_MFC 5#undef DEBUG -#ifdef DEBUG -#define DPRINTK printk -#else -static inline int DPRINTK (void *nothing, ...) {return 0 ;} -#endif static struct parport *this_port[MAX_MFC ] = {NULL , };static volatile int dummy;/* for trigger readds */
@@ -84,7 +79,7 @@ static struct parport_operations pp_mfc3_ops;static void mfc3_write_data (struct parport *p,unsigned char data) { -DPRINTK (KERN_DEBUG "write_data %c\n" ,data); +pr_debug ("write_data %c\n" , data); dummy =pia (p)->pprb;/* clears irq bit */ /* Triggers also /STROBE.*/
@@ -128,13 +123,13 @@ static unsigned char control_mfc3_to_pc(unsigned char control)static void mfc3_write_control (struct parport *p,unsigned char control) { -DPRINTK (KERN_DEBUG "write_control %02x\n" ,control); +pr_debug ("write_control %02x\n" , control);pia (p)->ppra = (pia (p)->ppra &0x1f ) |control_pc_to_mfc3 (control); }static unsigned char mfc3_read_control (struct parport *p) { -DPRINTK (KERN_DEBUG "read_control \n" ); +pr_debug ("read_control\n" );return control_mfc3_to_pc (pia (p)->ppra &0xe0 ); }
@@ -142,7 +137,7 @@ static unsigned char mfc3_frob_control( struct parport *p, unsigned char mask, u {unsigned char old; -DPRINTK (KERN_DEBUG "frob_control mask %02x, value %02x\n" ,mask,val); +pr_debug ("frob_control mask %02x, value %02x\n" , mask, val); old =mfc3_read_control (p);mfc3_write_control (p, (old & ~mask) ^ val);return old;
@@ -171,7 +166,7 @@ static unsigned char mfc3_read_status(struct parport *p)unsigned char status; status =status_mfc3_to_pc (pia (p)->ppra &0x1f ); -DPRINTK (KERN_DEBUG "read_status %02x\n" , status); +pr_debug ("read_status %02x\n" , status);return status; }
@@ -202,7 +197,7 @@ static void mfc3_disable_irq(struct parport *p)static void mfc3_data_forward (struct parport *p) { -DPRINTK (KERN_DEBUG "forward\n" ); +pr_debug ("forward\n" );pia (p)->crb &= ~PIA_DDR ;/* make data direction register visible */ pia (p)->pddrb =255 ;/* all pins output */ pia (p)->crb |=PIA_DDR ;/* make data register visible - default */
@@ -210,7 +205,7 @@ static void mfc3_data_forward(struct parport *p)static void mfc3_data_reverse (struct parport *p) { -DPRINTK (KERN_DEBUG "reverse\n" ); +pr_debug ("reverse\n" );pia (p)->crb &= ~PIA_DDR ;/* make data direction register visible */ pia (p)->pddrb =0 ;/* all pins input */ pia (p)->crb |=PIA_DDR ;/* make data register visible - default */
Signature · 1 line
2.11.0
Sudip Mukherjee
maintainerPATCH 7/11 parport_pc: Convert DPRINTK to pr_debug
In reply to Sudip MukherjeeFrom: Joe Perches <[email protected]>
Use a more common logging style.
Miscellanea:
o One message converted from KERN_INFO to KERN_DEBUG
--- drivers/parport/parport_pc.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)
drivers/parport/parport_pc.c +7 -16
@@ -87,13 +87,6 @@#undef DEBUG -#ifdef DEBUG -#define DPRINTK printk -#else -#define DPRINTK(stuff...) -#endif - -#define NR_SUPERIOS 3 static struct superio_struct { /* For Super-IO chips autodetection */ int io;
@@ -118,8 +111,8 @@ static void frob_econtrol(struct parport *pb, unsigned char m,if (m !=0xff ) ectr =inb (ECONTROL (pb)); -DPRINTK (KERN_DEBUG "frob_econtrol(%02x,%02x): %02x -> %02x\n" , - m, v, ectr, (ectr & ~m) ^ v); +pr_debug ("frob_econtrol(%02x,%02x): %02x -> %02x\n" , + m, v, ectr, (ectr & ~m) ^ v);outb ((ectr & ~m) ^ v,ECONTROL (pb)); }
@@ -142,7 +135,7 @@ static int change_mode(struct parport *p, int m)unsigned char oecr;int mode; -DPRINTK (KERN_INFO "parport change_mode ECP-ISA to mode 0x%02x\n" , m); +pr_debug ("parport change_mode ECP-ISA to mode 0x%02x\n" , m);if (!priv->ecr) {printk (KERN_DEBUG "change_mode: but there's no ECR!\n" );
@@ -2295,7 +2288,7 @@ static int sio_ite_8872_probe(struct pci_dev *pdev, int autoirq, int autodma,int irq;int i; -DPRINTK (KERN_DEBUG "sio_ite_8872_probe()\n" ); +pr_debug ("sio_ite_8872_probe()\n" );/* make sure which one chip */ for (i =0 ; i <5 ; i++) {
@@ -2360,11 +2353,9 @@ static int sio_ite_8872_probe(struct pci_dev *pdev, int autoirq, int autodma,pci_write_config_dword (pdev,0x9c , ite8872set | (ite8872_irq *0x11111 )); -DPRINTK (KERN_DEBUG "ITE887x: The IRQ is %d.\n" , ite8872_irq); -DPRINTK (KERN_DEBUG "ITE887x: The PARALLEL I/O port is 0x%x.\n" , - ite8872_lpt); -DPRINTK (KERN_DEBUG "ITE887x: The PARALLEL I/O porthi is 0x%x.\n" , - ite8872_lpthi); +pr_debug ("ITE887x: The IRQ is %d\n" , ite8872_irq); +pr_debug ("ITE887x: The PARALLEL I/O port is 0x%x\n" , ite8872_lpt); +pr_debug ("ITE887x: The PARALLEL I/O porthi is 0x%x\n" , ite8872_lpthi);/* Let the user (or defaults) steer us away from interrupts */ irq = ite8872_irq;
Signature · 1 line
2.11.0
Sudip Mukherjee
maintainerPATCH 8/11 parport: Standardize use of printmode
In reply to Sudip MukherjeeFrom: Joe Perches <[email protected]>
Standardize the define and the uses of printmode.
Miscellanea:
o Add missing statement termination ; where necessary
--- drivers/parport/parport_gsc.c | 8 ++++++-- drivers/parport/parport_pc.c | 14 ++++++-------- drivers/parport/procfs.c | 6 +++++- 3 files changed, 17 insertions(+), 11 deletions(-)
drivers/parport/parport_gsc.c +6 -2
@@ -299,12 +299,16 @@ struct parport *parport_gsc_probe_port(unsigned long base, p->dma =PARPORT_DMA_NONE ;pr_cont (" [" ); -#define printmode (x) {if(p->modes&PARPORT_MODE_##x){pr_cont("%s%s",f?",":"",#x);f++;}} +#define printmode (x) \ +do { \ + if (p->modes & PARPORT_MODE_##x) \ + pr_cont("%s%s", f++ ? "," : "", #x); \ +} while (0) {int f =0 ;printmode (PCSPP );printmode (TRISTATE ); -printmode (COMPAT) +printmode (COMPAT );printmode (EPP );// printmode(ECP); // printmode(DMA);
drivers/parport/parport_pc.c +6 -8
@@ -2134,19 +2134,17 @@ struct parport *parport_pc_probe_port(unsigned long int base,pr_cont (" [" ); -#define printmode (x) \ - {\ - if (p->modes & PARPORT_MODE_##x) {\ - pr_cont("%s%s", f ? "," : "", #x); \ - f++;\ - } \ - } +#define printmode (x) \ +do { \ + if (p->modes & PARPORT_MODE_##x) \ + pr_cont("%s%s", f++ ? "," : "", #x); \ +} while (0) {int f =0 ;printmode (PCSPP );printmode (TRISTATE ); -printmode (COMPAT) +printmode (COMPAT );printmode (EPP );printmode (ECP );printmode (DMA );
drivers/parport/procfs.c +5 -1
@@ -213,7 +213,11 @@ static int do_hardware_modes(struct ctl_table *table, int write,return -EACCES ; { -#define printmode (x) {if(port->modes&PARPORT_MODE_##x){len+=sprintf(buffer+len,"%s%s",f?",":"",#x);f++;}} +#define printmode (x) \ +do { \ + if (port->modes & PARPORT_MODE_##x) \ + len += sprintf(buffer + len, "%s%s", f++ ? "," : "", #x); \ +} while (0)int f =0 ;printmode (PCSPP );printmode (TRISTATE );
Signature · 1 line
2.11.0
Sudip Mukherjee
maintainerPATCH 9/11 parport: Add comments for parport_register_dev_model()
In reply to Sudip MukherjeeIn preparation to remove parport_register_device(), copy the comments to parport_register_dev_model() and modify the parameters according to what parport_register_dev_model() has.
--- drivers/parport/share.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/parport.h | 4 ++++ 2 files changed, 66 insertions(+)
drivers/parport/share.c +62 -0
@@ -841,6 +841,68 @@ static void free_pardevice(struct device *dev)kfree (par_dev); } +/** +* parport_register_dev_model - register a device on a parallel port +* @port: port to which the device is attached +* @name: a name to refer to the device +* @par_dev_cb: struct containing callbacks +* @id: device number to be given to the device +* +* This function, called by parallel port device drivers, +* declares that a device is connected to a port, and tells the +* system all it needs to know. +* +* The struct pardev_cb contains pointer to callbacks. preemption +* callback function, @preempt, is called when this device driver +* has claimed access to the port but another device driver wants +* to use it. It is given, @private, as its parameter, and should +* return zero if it is willing for the system to release the port +* to another driver on its behalf. If it wants to keep control of +* the port it should return non-zero, and no action will be taken. +* It is good manners for the driver to try to release the port at +* the earliest opportunity after its preemption callback rejects a +* preemption attempt. Note that if a preemption callback is happy +* for preemption to go ahead, there is no need to release the +* port; it is done automatically. This function may not block, as +* it may be called from interrupt context. If the device driver +* does not support preemption, @preempt can be %NULL. +* +* The wake-up ("kick") callback function, @wakeup, is called when +* the port is available to be claimed for exclusive access; that +* is, parport_claim() is guaranteed to succeed when called from +* inside the wake-up callback function. If the driver wants to +* claim the port it should do so; otherwise, it need not take +* any action. This function may not block, as it may be called +* from interrupt context. If the device driver does not want to +* be explicitly invited to claim the port in this way, @wakeup can +* be %NULL. +* +* The interrupt handler, @irq_func, is called when an interrupt +* arrives from the parallel port. Note that if a device driver +* wants to use interrupts it should use parport_enable_irq(), +* and can also check the irq member of the parport structure +* representing the port. +* +* The parallel port (lowlevel) driver is the one that has called +* request_irq() and whose interrupt handler is called first. +* This handler does whatever needs to be done to the hardware to +* acknowledge the interrupt (for PC-style ports there is nothing +* special to be done). It then tells the IEEE 1284 code about +* the interrupt, which may involve reacting to an IEEE 1284 +* event depending on the current IEEE 1284 phase. After this, +* it calls @irq_func. Needless to say, @irq_func will be called +* from interrupt context, and may not block. +* +* The %PARPORT_DEV_EXCL flag is for preventing port sharing, and +* so should only be used when sharing the port with other device +* drivers is impossible and would lead to incorrect behaviour. +* Use it sparingly! Normally, @flags will be zero. +* +* This function returns a pointer to a structure that represents +* the device on the port, or %NULL if there is not enough memory +* to allocate space for that structure. +**/ +struct pardevice *parport_register_dev_model (struct parport *port,const char *name,const struct pardev_cb *par_dev_cb,int id)
include/linux/parport.h +4 -0
@@ -337,6 +337,10 @@ struct pardevice *parport_register_device(struct parport *port,void (*irq_func)(void *), int flags, void *handle); +/* +* parport_register_dev_model declares that a device is connected to a +* port, and tells the kernel all it needs to know. +*/ struct pardevice *parport_register_dev_model (struct parport *port,const char *name,const struct pardev_cb *par_dev_cb,int cnt);
Signature · 1 line
2.11.0
Sudip Mukherjee
maintainerPATCH 10/11 parport: remove unused parport_register_device()
In reply to Sudip MukherjeeAll the drivers that are using parallel port has been converted to use the new device model api, and parport_register_device() is no longer used.
--- drivers/parport/share.c | 192 ------------------------------------------------ include/linux/parport.h | 12 --- 2 files changed, 204 deletions(-)
drivers/parport/share.c +0 -192
@@ -641,198 +641,6 @@ void parport_remove_port(struct parport *port) }EXPORT_SYMBOL (parport_remove_port); -/** -* parport_register_device - register a device on a parallel port -* @port: port to which the device is attached -* @name: a name to refer to the device -* @pf: preemption callback -* @kf: kick callback (wake-up) -* @irq_func: interrupt handler -* @flags: registration flags -* @handle: data for callback functions -* -* This function, called by parallel port device drivers, -* declares that a device is connected to a port, and tells the -* system all it needs to know. -* -* The @name is allocated by the caller and must not be -* deallocated until the caller calls @parport_unregister_device -* for that device. -* -* The preemption callback function, @pf, is called when this -* device driver has claimed access to the port but another -* device driver wants to use it. It is given @handle as its -* parameter, and should return zero if it is willing for the -* system to release the port to another driver on its behalf. -* If it wants to keep control of the port it should return -* non-zero, and no action will be taken. It is good manners for -* the driver to try to release the port at the earliest -* opportunity after its preemption callback rejects a preemption -* attempt. Note that if a preemption callback is happy for -* preemption to go ahead, there is no need to release the port; -* it is done automatically. This function may not block, as it -* may be called from interrupt context. If the device driver -* does not support preemption, @pf can be %NULL. -* -* The wake-up ("kick") callback function, @kf, is called when -* the port is available to be claimed for exclusive access; that -* is, parport_claim() is guaranteed to succeed when called from -* inside the wake-up callback function. If the driver wants to -* claim the port it should do so; otherwise, it need not take -* any action. This function may not block, as it may be called -* from interrupt context. If the device driver does not want to -* be explicitly invited to claim the port in this way, @kf can -* be %NULL. -* -* The interrupt handler, @irq_func, is called when an interrupt -* arrives from the parallel port. Note that if a device driver -* wants to use interrupts it should use parport_enable_irq(), -* and can also check the irq member of the parport structure -* representing the port. -* -* The parallel port (lowlevel) driver is the one that has called -* request_irq() and whose interrupt handler is called first. -* This handler does whatever needs to be done to the hardware to -* acknowledge the interrupt (for PC-style ports there is nothing -* special to be done). It then tells the IEEE 1284 code about -* the interrupt, which may involve reacting to an IEEE 1284 -* event depending on the current IEEE 1284 phase. After this, -* it calls @irq_func. Needless to say, @irq_func will be called -* from interrupt context, and may not block. -* -* The %PARPORT_DEV_EXCL flag is for preventing port sharing, and -* so should only be used when sharing the port with other device -* drivers is impossible and would lead to incorrect behaviour. -* Use it sparingly! Normally, @flags will be zero. -* -* This function returns a pointer to a structure that represents -* the device on the port, or %NULL if there is not enough memory -* to allocate space for that structure. -**/ - -struct pardevice * -parport_register_device (struct parport *port,const char *name, -int (*pf)(void *),void (*kf)(void *), -void (*irq_func)(void *), -int flags,void *handle) -{ -struct pardevice *tmp; - -if (port->physport->flags &PARPORT_FLAG_EXCL ) { -/* An exclusive device is registered. */ -printk (KERN_DEBUG "%s: no more devices allowed\n" , port->name); -return NULL ; - } - -if (flags &PARPORT_DEV_LURK ) { -if (!pf || !kf) { -pr_info ("%s: refused to register lurking device (%s) without callbacks\n" , - port->name, name); -return NULL ; - } - } - -if (flags &PARPORT_DEV_EXCL ) { -if (port->physport->devices) { -/* -* If a device is already registered and this new -* device wants exclusive access, then no need to -* continue as we can not grant exclusive access to -* this device. -*/ -pr_err ("%s: cannot grant exclusive access for device %s\n" , - port->name, name); -return NULL ; - } - } - -/* -* We up our own module reference count, and that of the port -* on which a device is to be registered, to ensure that -* neither of us gets unloaded while we sleep in (e.g.) -* kmalloc. -*/ -if (!try_module_get (port->ops->owner)) -return NULL ; - -parport_get_port (port); - - tmp =kmalloc (sizeof (struct pardevice ),GFP_KERNEL ); -if (!tmp) - goto out; - - tmp->state =kmalloc (sizeof (struct parport_state ),GFP_KERNEL ); -if (!tmp->state) - goto out_free_pardevice; - - tmp->name = name; - tmp->port = port; - tmp->daisy =-1 ; - tmp->preempt = pf; - tmp->wakeup = kf; - tmp->private = handle; - tmp->flags = flags; - tmp->irq_func = irq_func; - tmp->waiting =0 ; - tmp->timeout =5 *HZ ; - tmp->devmodel = false; - -/* Chain this onto the list */ - tmp->prev =NULL ; -/* -* This function must not run from an irq handler so we don' t need -* to clear irq on the local CPU. -arca -*/ -spin_lock (&port->physport->pardevice_lock); - -if (flags &PARPORT_DEV_EXCL ) { -if (port->physport->devices) { -spin_unlock (&port->physport->pardevice_lock); -printk (KERN_DEBUG "%s: cannot grant exclusive access for device %s\n" , - port->name, name); - goto out_free_all; - } - port->flags |=PARPORT_FLAG_EXCL ; - } - - tmp->next = port->physport->devices; -wmb ();/* -* Make sure that tmp->next is written before it's -* added to the list; see comments marked 'no locking -* required' -*/ -if (port->physport->devices) - port->physport->devices->prev = tmp; - port->physport->devices = tmp; -spin_unlock (&port->physport->pardevice_lock); - -init_waitqueue_head (&tmp->wait_q); - tmp->timeslice = parport_default_timeslice; - tmp->waitnext = tmp->waitprev =NULL ; - -/* -* This has to be run as last thing since init_state may need other -* pardevice fields. -arca -*/ - port->ops->init_state (tmp, tmp->state); -if (!test_and_set_bit (PARPORT_DEVPROC_REGISTERED , &port->devflags)) { - port->proc_device = tmp; -parport_device_proc_register (tmp); - } -return tmp; - - out_free_all: -kfree (tmp->state); - out_free_pardevice: -kfree (tmp); - out: -parport_put_port (port); -module_put (port->ops->owner); - -return NULL ; -} -EXPORT_SYMBOL (parport_register_device); -static void free_pardevice (struct device *dev) {struct pardevice *par_dev =to_pardevice (dev);
include/linux/parport.h +0 -12
@@ -325,18 +325,6 @@ struct pardev_cb {unsigned int flags; }; -/* parport_register_device declares that a device is connected to a -port, and tells the kernel all it needs to know. -- pf is the preemption function (may be NULL for no callback) -- kf is the wake-up function (may be NULL for no callback) -- irq_func is the interrupt handler (may be NULL for no interrupts) -- handle is a user pointer that gets handed to callback functions. */ -struct pardevice *parport_register_device (struct parport *port, -const char *name, -int (*pf)(void *),void (*kf)(void *), -void (*irq_func)(void *), -int flags,void *handle); -/* * parport_register_dev_model declares that a device is connected to a * port, and tells the kernel all it needs to know.
Signature · 1 line
2.11.0
Sudip Mukherjee
maintainerPATCH 11/11 parport: remove use of devmodel
In reply to Sudip MukherjeeNow that all the drivers using parallel port has been converted to use device model, there is no driver left which has devmodel as false. Remove the part of the code which expects devmodel can be false.
--- drivers/parport/share.c | 81 +++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 53 deletions(-)
drivers/parport/share.c +28 -53
@@ -278,46 +278,32 @@ static int port_detect(struct device *dev, void *dev_drv)int __parport_register_driver (struct parport_driver *drv,struct module *owner,const char *mod_name) { -if (drv->devmodel) { -/* using device model */ -int ret; - -/* initialize common driver fields */ - drv->driver.name = drv->name; - drv->driver.bus = &parport_bus_type; - drv->driver.owner = owner; - drv->driver.mod_name = mod_name; - ret =driver_register (&drv->driver); -if (ret) -return ret; +/* using device model */ +int ret; -/* -* check if bus has any parallel port registered, if -* none is found then load the lowlevel driver. -*/ - ret =bus_for_each_dev (&parport_bus_type,NULL ,NULL , - port_detect); -if (!ret) -get_lowlevel_driver (); - -mutex_lock (®istration_lock); -if (drv->match_port) -bus_for_each_dev (&parport_bus_type,NULL , drv, - port_check); -mutex_unlock (®istration_lock); - }else { -struct parport *port; - - drv->devmodel = false; - -if (list_empty (&portlist)) -get_lowlevel_driver (); -mutex_lock (®istration_lock); -list_for_each_entry (port, &portlist, list) - drv->attach (port); -list_add (&drv->list, &drivers); -mutex_unlock (®istration_lock); - } +/* initialize common driver fields */ + drv->driver.name = drv->name; + drv->driver.bus = &parport_bus_type; + drv->driver.owner = owner; + drv->driver.mod_name = mod_name; + ret =driver_register (&drv->driver); +if (ret) +return ret; + +/* +* check if bus has any parallel port registered, if +* none is found then load the lowlevel driver. +*/ + ret =bus_for_each_dev (&parport_bus_type,NULL ,NULL , + port_detect); +if (!ret) +get_lowlevel_driver (); + +mutex_lock (®istration_lock); +if (drv->match_port) +bus_for_each_dev (&parport_bus_type,NULL , drv, + port_check); +mutex_unlock (®istration_lock);return 0 ; }
@@ -352,17 +338,9 @@ static int port_detach(struct device *dev, void *_drv)void parport_unregister_driver (struct parport_driver *drv) { -struct parport *port; -mutex_lock (®istration_lock); -if (drv->devmodel) { -bus_for_each_dev (&parport_bus_type,NULL , drv, port_detach); -driver_unregister (&drv->driver); - }else { -list_del_init (&drv->list); -list_for_each_entry (port, &portlist, list) - drv->detach (port); - } +bus_for_each_dev (&parport_bus_type,NULL , drv, port_detach); +driver_unregister (&drv->driver);mutex_unlock (®istration_lock); }EXPORT_SYMBOL (parport_unregister_driver);
@@ -915,10 +893,7 @@ void parport_unregister_device(struct pardevice *dev)spin_unlock_irq (&port->waitlist_lock);kfree (dev->state); -if (dev->devmodel) -device_unregister (&dev->dev); -else -kfree (dev); +device_unregister (&dev->dev);module_put (port->ops->owner);parport_put_port (port);
Signature · 1 line
2.11.0