From: Anton Wuerfel <anton.wuerfel@fau.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Jiri Slaby" <jslaby@suse.com>,
"James E.J. Bottomley" <jejb@parisc-linux.org>,
"Helge Deller" <deller@gmx.de>,
"Joachim Eastwood" <manabian@gmail.com>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
"Masahiro Yamada" <yamada.masahiro@socionext.com>,
"Peter Hurley" <peter@hurleysoftware.com>,
"Sebastian Andrzej Siewior" <bigeasy@linutronix.de>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
"Phillip Raffeck" <phillip.raffeck@fau.de>,
"Heikki Krogerus" <heikki.krogerus@linux.intel.com>,
"Peter Hung" <hpeter@gmail.com>,
linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-parisc@vger.kernel.org, linux-kernel@i4.cs.fau.de,
"Anton Würfel" <anton.wuerfel@fau.de>
Subject: [PATCH v6 10/15] tty: serial: 8250: Suitably replace printk
Date: Wed, 13 Jan 2016 22:29:16 +0100 [thread overview]
Message-ID: <1452720561-28443-11-git-send-email-anton.wuerfel@fau.de> (raw)
In-Reply-To: <1452720561-28443-1-git-send-email-anton.wuerfel@fau.de>
From: Phillip Raffeck <phillip.raffeck@fau.de>
This patch replaces printk by the corresponding variant of dev_* in order
to fix checkpatch warnings. If no suitable device pointer is present, the
corresponding pr_* variant is used.
Signed-off-by: Phillip Raffeck <phillip.raffeck@fau.de>
Signed-off-by: Anton Würfel <anton.wuerfel@fau.de>
Cc: linux-kernel@i4.cs.fau.de
---
drivers/tty/serial/8250/8250_core.c | 5 ++---
drivers/tty/serial/8250/8250_gsc.c | 7 ++++---
drivers/tty/serial/8250/8250_hp300.c | 20 +++++++++++---------
drivers/tty/serial/8250/8250_port.c | 3 +--
4 files changed, 18 insertions(+), 17 deletions(-)
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..b1e6ae9 100644
--- a/drivers/tty/serial/8250/8250_gsc.c
+++ b/drivers/tty/serial/8250/8250_gsc.c
@@ -42,7 +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
+ dev_info(&dev->dev,
"Serial: device 0x%llx not configured.\n"
"Enable support for Wax, Lasi, Asp or Dino.\n",
(unsigned long long)dev->hpa.start);
@@ -66,8 +66,9 @@ 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);
+ dev_warn(&dev->dev,
+ "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..38166db 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("%s: early_serial_setup() failed.\n", __func__);
return 0;
}
#endif /* CONFIG_SERIAL_8250_CONSOLE */
@@ -179,8 +179,9 @@ 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);
+ dev_notice(&d->dev,
+ "8250_hp300: register_serial() DCA scode %d irq %d failed\n",
+ d->scode, uart.port.irq);
return -ENOMEM;
}
@@ -260,8 +261,9 @@ 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);
+ dev_notice(uart.port.dev,
+ "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_port.c b/drivers/tty/serial/8250/8250_port.c
index 5375c24..25fd6b4 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);
}
--
1.9.1
next prev parent reply other threads:[~2016-01-13 21:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-13 21:29 [PATCH v6 00/15] tty: serial: 8250: Fix checkpatch warnings Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 01/15] tty: serial: 8250: Fix whitespace errors Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 02/15] tty: serial: 8250: Replace spaces with tabs Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 03/15] tty: serial: 8250: Fix braces after struct Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 04/15] tty: serial: 8250: Fix multiline comment style Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 05/15] tty: serial: 8250: Remove else after return Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 06/15] tty: serial: 8250: Move EXPORT_SYMBOL to function Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 07/15] tty: serial: 8250: Fix line continuation warning Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 08/15] tty: serial: 8250: Add parentheses to macro Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 09/15] tty: serial: 8250: Fix multi-line strings Anton Wuerfel
2016-01-13 21:29 ` Anton Wuerfel [this message]
2016-01-13 21:29 ` [PATCH v6 11/15] tty: serial: 8250: Remove SERIAL_DEBUG_PNP macro Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 12/15] tty: serial: 8250: Correct conversion specifiers Anton Wuerfel
2016-01-14 9:31 ` Andy Shevchenko
2016-01-13 21:29 ` [PATCH v6 13/15] tty: serial: 8250: Merge duplicate conditions Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 14/15] tty: serial: 8250: Fix indentation warnings Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 15/15] tty: serial: 8250: Add generic port init macro Anton Wuerfel
2016-01-14 9:13 ` [PATCH v6 00/15] tty: serial: 8250: Fix checkpatch warnings Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452720561-28443-11-git-send-email-anton.wuerfel@fau.de \
--to=anton.wuerfel@fau.de \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bigeasy@linutronix.de \
--cc=deller@gmx.de \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=hpeter@gmail.com \
--cc=jejb@parisc-linux.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@i4.cs.fau.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=manabian@gmail.com \
--cc=matthias.bgg@gmail.com \
--cc=peter@hurleysoftware.com \
--cc=phillip.raffeck@fau.de \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®