| Message ID | 1450437723-2978-11-git-send-email-anton.wuerfel@fau.de (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On Fri, 2015-12-18 at 12:22 +0100, Anton Wuerfel wrote: > This comes with a slight change in behaviour as > pr_debug is configurable via CONFIG_DYNAMIC_DEBUG, whereas > printk(KERN_DEBUG ...) is not. --- a/drivers/tty/serial/8250/8250_pnp.c > +++ b/drivers/tty/serial/8250/8250_pnp.c > @@ -465,9 +465,9 @@ serial_pnp_probe(struct pnp_dev *dev, const > struct pnp_device_id *dev_id) > return -ENODEV; > > #ifdef SERIAL_DEBUG_PNP > - printk(KERN_DEBUG I think it's not okay. The rationale to have printk(KERN_DEBUG …) here is to allow a compilation with support of those messages independently on DYNAMIC_DEBUG. If you want to switch to DYNAMIC_DEBUG you have to carefully check what is done under SERIAL_DEBUG_PNP. git grep on current linux-next shows that SERIAL_DEBUG_PNP is an orphan. So, I would suggest to remove #ifdef. > - "Setup PNP port: port %x, mem 0x%lx, irq %d, type > %d\n", > - uart.port.iobase, uart.port.mapbase, > uart.port.irq, uart.port.iotype); > + pr_debug("Setup PNP port: port %x, mem 0x%lx, irq %d, type > %d\n", > + uart.port.iobase, uart.port.mapbase, > + uart.port.irq, uart.port.iotype); > #endif >
T24gRnJpLCAyMDE1LTEyLTE4IGF0IDE0OjMyICswMjAwLCBBbmR5IFNoZXZjaGVua28gd3JvdGU6 DQo+IE9uIEZyaSwgMjAxNS0xMi0xOCBhdCAxMjoyMiArMDEwMCwgQW50b24gV3VlcmZlbCB3cm90 ZToNCj4gDQo+IA0KPiA+IMKgVGhpcyBjb21lcyB3aXRoIGEgc2xpZ2h0IGNoYW5nZSBpbiBiZWhh dmlvdXIgYXMNCj4gPiBwcl9kZWJ1ZyBpcyBjb25maWd1cmFibGUgdmlhIENPTkZJR19EWU5BTUlD X0RFQlVHLCB3aGVyZWFzDQo+ID4gcHJpbnRrKEtFUk5fREVCVUcgLi4uKSBpcyBub3QuDQo+IA0K PiAtLS0gYS9kcml2ZXJzL3R0eS9zZXJpYWwvODI1MC84MjUwX3BucC5jDQo+ID4gKysrIGIvZHJp dmVycy90dHkvc2VyaWFsLzgyNTAvODI1MF9wbnAuYw0KPiA+IEBAIC00NjUsOSArNDY1LDkgQEAg c2VyaWFsX3BucF9wcm9iZShzdHJ1Y3QgcG5wX2RldiAqZGV2LCBjb25zdA0KPiA+IHN0cnVjdCBw bnBfZGV2aWNlX2lkICpkZXZfaWQpDQoNCk9uZSBtb3JlIHRoaW5nIGp1c3Qgbm90aWNlZCB0aGF0 IGlzIC0+cHJvYmUoKSBmdW5jdGlvbiB3aGVyZSB5b3UgaGF2ZQ0Kc3RydWN0IGRldmljZSBkZWZp bmVkLCBpdCBtaWdodCBiZSB3b3J0aCB0byBjaGFuZ2UgdG8gZGV2XyogbWFjcm9zDQppbnN0ZWFk IG9mIHByXyBhdCB0aGUgc2FtZSB0aW1lIGZvciBzb21lIGZ1bmN0aW9ucy4NCg0KU28sIGhlcmUg aXQgd291bGQgYmUgZGV2X2RiZygmZGV2LT5kZXYsIOKApikgSSBzdXBwb3NlLg0KDQoNCi0tIA0K QW5keSBTaGV2Y2hlbmtvIDxhbmRyaXkuc2hldmNoZW5rb0BpbnRlbC5jb20+DQpJbnRlbCBGaW5s YW5kIE95DQotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KSW50ZWwgRmlubGFuZCBPeQpSZWdpc3RlcmVkIEFkZHJlc3M6 IFBMIDI4MSwgMDAxODEgSGVsc2lua2kgCkJ1c2luZXNzIElkZW50aXR5IENvZGU6IDAzNTc2MDYg LSA0IApEb21pY2lsZWQgaW4gSGVsc2lua2kgCgpUaGlzIGUtbWFpbCBhbmQgYW55IGF0dGFjaG1l bnRzIG1heSBjb250YWluIGNvbmZpZGVudGlhbCBtYXRlcmlhbCBmb3IKdGhlIHNvbGUgdXNlIG9m IHRoZSBpbnRlbmRlZCByZWNpcGllbnQocykuIEFueSByZXZpZXcgb3IgZGlzdHJpYnV0aW9uCmJ5 IG90aGVycyBpcyBzdHJpY3RseSBwcm9oaWJpdGVkLiBJZiB5b3UgYXJlIG5vdCB0aGUgaW50ZW5k ZWQKcmVjaXBpZW50LCBwbGVhc2UgY29udGFjdCB0aGUgc2VuZGVyIGFuZCBkZWxldGUgYWxsIGNv cGllcy4K -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Anton, On 12/18/2015 04:32 AM, Andy Shevchenko wrote: > On Fri, 2015-12-18 at 12:22 +0100, Anton Wuerfel wrote: > > >> This comes with a slight change in behaviour as >> pr_debug is configurable via CONFIG_DYNAMIC_DEBUG, whereas >> printk(KERN_DEBUG ...) is not. Please make this one change and the changes Andy is suggesting it a separate patch. That way the commit can describe how the get the equivalent behavior (ie., with CONFIG_DYNAMIC_DEBUG) rather than with -DSERIAL_DEBUG_PNP. Regards, Peter Hurley > --- a/drivers/tty/serial/8250/8250_pnp.c >> +++ b/drivers/tty/serial/8250/8250_pnp.c >> @@ -465,9 +465,9 @@ serial_pnp_probe(struct pnp_dev *dev, const >> struct pnp_device_id *dev_id) >> return -ENODEV; >> >> #ifdef SERIAL_DEBUG_PNP >> - printk(KERN_DEBUG > > I think it's not okay. > > The rationale to have printk(KERN_DEBUG …) here is to allow a > compilation with support of those messages independently on > DYNAMIC_DEBUG. > > If you want to switch to DYNAMIC_DEBUG you have to carefully check what > is done under SERIAL_DEBUG_PNP. > > git grep on current linux-next shows that SERIAL_DEBUG_PNP is an > orphan. > > So, I would suggest to remove #ifdef. > >> - "Setup PNP port: port %x, mem 0x%lx, irq %d, type >> %d\n", >> - uart.port.iobase, uart.port.mapbase, >> uart.port.irq, uart.port.iotype); >> + pr_debug("Setup PNP port: port %x, mem 0x%lx, irq %d, type >> %d\n", >> + uart.port.iobase, uart.port.mapbase, >> + uart.port.irq, uart.port.iotype); >> #endif >> > > -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index b60b58b..d6b4906 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -1094,9 +1094,8 @@ static int __init serial8250_init(void) serial8250_isa_init_ports(); - printk(KERN_INFO "Serial: 8250/16550 driver, " - "%d ports, IRQ sharing %sabled\n", nr_uarts, - share_irqs ? "en" : "dis"); + pr_info("Serial: 8250/16550 driver, %d ports, IRQ sharing %sabled\n", + nr_uarts, share_irqs ? "en" : "dis"); #ifdef CONFIG_SPARC ret = sunserial_register_minors(&serial8250_reg, UART_NR); diff --git a/drivers/tty/serial/8250/8250_gsc.c b/drivers/tty/serial/8250/8250_gsc.c index 2e3ea1a..a9b63d0 100644 --- a/drivers/tty/serial/8250/8250_gsc.c +++ b/drivers/tty/serial/8250/8250_gsc.c @@ -42,8 +42,7 @@ static int __init serial_init_chip(struct parisc_device *dev) * the user what they're missing. */ if (parisc_parent(dev)->id.hw_type != HPHW_IOA) - printk(KERN_INFO - "Serial: device 0x%llx not configured.\n" + pr_info("Serial: device 0x%llx not configured.\n" "Enable support for Wax, Lasi, Asp or Dino.\n", (unsigned long long)dev->hpa.start); return -ENODEV; @@ -66,8 +65,7 @@ static int __init serial_init_chip(struct parisc_device *dev) err = serial8250_register_8250_port(&uart); if (err < 0) { - printk(KERN_WARNING - "serial8250_register_8250_port returned error %d\n", err); + pr_warn("serial8250_register_8250_port returned error %d\n", err); iounmap(uart.port.membase); return err; } diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c index cf566bb..9123e31 100644 --- a/drivers/tty/serial/8250/8250_hp300.c +++ b/drivers/tty/serial/8250/8250_hp300.c @@ -110,7 +110,7 @@ int __init hp300_setup_serial_console(void) /* Check for APCI console */ if (scode == 256) { #ifdef CONFIG_HPAPCI - printk(KERN_INFO "Serial console is HP APCI 1\n"); + pr_info("Serial console is HP APCI 1\n"); port.uartclk = HPAPCI_BAUD_BASE * 16; port.mapbase = (FRODO_BASE + FRODO_APCI_OFFSET(1)); @@ -118,7 +118,7 @@ int __init hp300_setup_serial_console(void) port.regshift = 2; add_preferred_console("ttyS", port.line, "9600n8"); #else - printk(KERN_WARNING "Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n"); + pr_warn("Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n"); return 0; #endif } else { @@ -127,7 +127,7 @@ int __init hp300_setup_serial_console(void) if (!pa) return 0; - printk(KERN_INFO "Serial console is HP DCA at select code %d\n", scode); + pr_info("Serial console is HP DCA at select code %d\n", scode); port.uartclk = HPDCA_BAUD_BASE * 16; port.mapbase = (pa + UART_OFFSET); @@ -141,13 +141,13 @@ int __init hp300_setup_serial_console(void) if (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80) add_preferred_console("ttyS", port.line, "9600n8"); #else - printk(KERN_WARNING "Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n"); + pr_warn("Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n"); return 0; #endif } if (early_serial_setup(&port) < 0) - printk(KERN_WARNING "hp300_setup_serial_console(): early_serial_setup() failed.\n"); + pr_warn("hp300_setup_serial_console(): early_serial_setup() failed.\n"); return 0; } #endif /* CONFIG_SERIAL_8250_CONSOLE */ @@ -179,8 +179,8 @@ static int hpdca_init_one(struct dio_dev *d, line = serial8250_register_8250_port(&uart); if (line < 0) { - printk(KERN_NOTICE "8250_hp300: register_serial() DCA scode %d" - " irq %d failed\n", d->scode, uart.port.irq); + pr_notice("8250_hp300: register_serial() DCA scode %d irq %d failed\n", + d->scode, uart.port.irq); return -ENOMEM; } @@ -260,8 +260,8 @@ static int __init hp300_8250_init(void) line = serial8250_register_8250_port(&uart); if (line < 0) { - printk(KERN_NOTICE "8250_hp300: register_serial() APCI" - " %d irq %d failed\n", i, uart.port.irq); + pr_notice("8250_hp300: register_serial() APCI %d irq %d failed\n", + i, uart.port.irq); kfree(port); continue; } diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c index ffa7354..1ed67e0 100644 --- a/drivers/tty/serial/8250/8250_pnp.c +++ b/drivers/tty/serial/8250/8250_pnp.c @@ -465,9 +465,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) return -ENODEV; #ifdef SERIAL_DEBUG_PNP - printk(KERN_DEBUG - "Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n", - uart.port.iobase, uart.port.mapbase, uart.port.irq, uart.port.iotype); + pr_debug("Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n", + uart.port.iobase, uart.port.mapbase, + uart.port.irq, uart.port.iotype); #endif if (flags & CIR_PORT) { uart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE; diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index 99f709c..343d050 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -1222,8 +1222,7 @@ static void autoconfig(struct uart_8250_port *up) out_lock: spin_unlock_irqrestore(&port->lock, flags); if (up->capabilities != old_capabilities) { - printk(KERN_WARNING - "ttyS%d: detected caps %08x should be %08x\n", + pr_warn("ttyS%d: detected caps %08x should be %08x\n", serial_index(port), old_capabilities, up->capabilities); }