AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

parport: quoted strings should not be split

Browse Source 
user visible strings should not be split as that affects the ability to
grep.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sudip Mukherjee 2015-10-28 14:41:35 +05:30 committed by Greg Kroah-Hartman
parent b075e6f051
commit a162188f9c
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/parport/share.c
View File

@ -537,9 +537,8 @@ void parport_announce_port (struct parport *port)
#endif #endif
if (!port->dev) if (!port->dev)
printk(KERN_WARNING "%s: fix this legacy " printk(KERN_WARNING "%s: fix this legacy no-device port driver!\n",
"no-device port driver!\n", port->name);
port->name);
parport_proc_register(port); parport_proc_register(port);
mutex_lock(&registration_lock); mutex_lock(&registration_lock);
@ -778,8 +777,8 @@ parport_register_device(struct parport *port, const char *name,
if (port->physport->devices) { if (port->physport->devices) {
spin_unlock (&port->physport->pardevice_lock); spin_unlock (&port->physport->pardevice_lock);
printk (KERN_DEBUG printk (KERN_DEBUG
"%s: cannot grant exclusive access for " "%s: cannot grant exclusive access for device %s\n",
"device %s\n", port->name, name); port->name, name);
goto out_free_all; goto out_free_all;
} }
port->flags |= PARPORT_FLAG_EXCL; port->flags |= PARPORT_FLAG_EXCL;
@ -1276,9 +1275,8 @@ int parport_claim_or_block(struct pardevice *dev)
#ifdef PARPORT_DEBUG_SHARING #ifdef PARPORT_DEBUG_SHARING
if (dev->port->physport->cad != dev) if (dev->port->physport->cad != dev)
printk(KERN_DEBUG "%s: exiting parport_claim_or_block " printk(KERN_DEBUG "%s: exiting parport_claim_or_block but %s owns port!\n",
"but %s owns port!\n", dev->name, dev->name, dev->port->physport->cad ?
dev->port->physport->cad ?
dev->port->physport->cad->name:"nobody"); dev->port->physport->cad->name:"nobody");
#endif #endif
} }
@ -1306,8 +1304,8 @@ void parport_release(struct pardevice *dev)
write_lock_irqsave(&port->cad_lock, flags); write_lock_irqsave(&port->cad_lock, flags);
if (port->cad != dev) { if (port->cad != dev) {
write_unlock_irqrestore (&port->cad_lock, flags); write_unlock_irqrestore (&port->cad_lock, flags);
printk(KERN_WARNING "%s: %s tried to release parport " printk(KERN_WARNING "%s: %s tried to release parport when not owner\n",
"when not owner\n", port->name, dev->name); port->name, dev->name);
return; return;
} }