From: Finn Thain <fthain@telegraphics.com.au>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greg Ungerer <gerg@linux-m68k.org>, Sam Creasey <sammy@sammy.net>,
Joshua Thompson <funaho@jurai.org>,
linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 11/22] m68k/mac: Modernize printing of kernel messages
Date: Thu, 8 Dec 2016 10:17:56 +1100 (AEDT) [thread overview]
Message-ID: <alpine.LNX.2.00.1612081012380.9219@nippy.intranet> (raw)
In-Reply-To: <1481123360-10978-12-git-send-email-geert@linux-m68k.org>
On Wed, 7 Dec 2016, Geert Uytterhoeven wrote:
> Convert from printk() to pr_*().
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
> arch/m68k/mac/config.c | 34 ++++++++++++++++------------------
> arch/m68k/mac/misc.c | 8 ++++----
> 2 files changed, 20 insertions(+), 22 deletions(-)
>
> diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
> index e46895316eb0ef4d..1d7bc6ab3e7fe1b4 100644
> --- a/arch/m68k/mac/config.c
> +++ b/arch/m68k/mac/config.c
> @@ -150,7 +150,7 @@ static void mac_cache_card_flush(int writeback)
> void __init config_mac(void)
> {
> if (!MACH_IS_MAC)
> - printk(KERN_ERR "ERROR: no Mac, but config_mac() called!!\n");
> + pr_err("ERROR: no Mac, but config_mac() called!!\n");
>
> mach_sched_init = mac_sched_init;
> mach_init_IRQ = mac_init_IRQ;
I think this printk is impossible to reach.
> @@ -837,8 +837,7 @@ static void __init mac_identify(void)
> /* no bootinfo model id -> NetBSD booter was used! */
> /* XXX FIXME: breaks for model > 31 */
> model = (mac_bi_data.cpuid >> 2) & 63;
> - printk(KERN_WARNING "No bootinfo model ID, using cpuid instead "
> - "(obsolete bootloader?)\n");
> + pr_warn("No bootinfo model ID, using cpuid instead (obsolete bootloader?)\n");
> }
>
> macintosh_config = mac_data_table;
> @@ -880,24 +879,23 @@ static void __init mac_identify(void)
> */
> iop_preinit();
>
> - printk(KERN_INFO "Detected Macintosh model: %d\n", model);
> + pr_info("Detected Macintosh model: %d\n", model);
>
> /*
> * Report booter data:
> */
> - printk(KERN_DEBUG " Penguin bootinfo data:\n");
> - printk(KERN_DEBUG " Video: addr 0x%lx "
> - "row 0x%lx depth %lx dimensions %ld x %ld\n",
> - mac_bi_data.videoaddr, mac_bi_data.videorow,
> - mac_bi_data.videodepth, mac_bi_data.dimensions & 0xFFFF,
> - mac_bi_data.dimensions >> 16);
> - printk(KERN_DEBUG " Videological 0x%lx phys. 0x%lx, SCC at 0x%lx\n",
> - mac_bi_data.videological, mac_orig_videoaddr,
> - mac_bi_data.sccbase);
> - printk(KERN_DEBUG " Boottime: 0x%lx GMTBias: 0x%lx\n",
> - mac_bi_data.boottime, mac_bi_data.gmtbias);
> - printk(KERN_DEBUG " Machine ID: %ld CPUid: 0x%lx memory size: 0x%lx\n",
> - mac_bi_data.id, mac_bi_data.cpuid, mac_bi_data.memsize);
> + pr_debug(" Penguin bootinfo data:\n");
> + pr_debug(" Video: addr 0x%lx row 0x%lx depth %lx dimensions %ld x %ld\n",
> + mac_bi_data.videoaddr, mac_bi_data.videorow,
> + mac_bi_data.videodepth, mac_bi_data.dimensions & 0xFFFF,
> + mac_bi_data.dimensions >> 16);
> + pr_debug(" Videological 0x%lx phys. 0x%lx, SCC at 0x%lx\n",
> + mac_bi_data.videological, mac_orig_videoaddr,
> + mac_bi_data.sccbase);
> + pr_debug(" Boottime: 0x%lx GMTBias: 0x%lx\n", mac_bi_data.boottime,
> + mac_bi_data.gmtbias);
> + pr_debug(" Machine ID: %ld CPUid: 0x%lx memory size: 0x%lx\n",
> + mac_bi_data.id, mac_bi_data.cpuid, mac_bi_data.memsize);
>
> iop_init();
> via_init();
I'd prefer that these remained printk(KERN_DEBUG ...).
> @@ -912,7 +910,7 @@ static void __init mac_identify(void)
>
> static void __init mac_report_hardware(void)
> {
> - printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name);
> + pr_info("Apple Macintosh %s\n", macintosh_config->name);
> }
>
> static void mac_get_model(char *str)
> diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
> index 0fb54a90eac27305..676e0caaeaa670a0 100644
> --- a/arch/m68k/mac/misc.c
> +++ b/arch/m68k/mac/misc.c
> @@ -520,7 +520,7 @@ void mac_poweroff(void)
> #endif
> }
> local_irq_enable();
> - printk("It is now safe to turn off your Macintosh.\n");
> + pr_info("It is now safe to turn off your Macintosh.\n");
> while(1);
> }
>
> @@ -610,7 +610,7 @@ void mac_reset(void)
>
> /* should never get here */
> local_irq_enable();
> - printk ("Restart failed. Please restart manually.\n");
> + pr_err("Restart failed. Please restart manually.\n");
> while(1);
> }
>
> @@ -718,13 +718,13 @@ int mac_hwclk(int op, struct rtc_time *t)
> &t->tm_year, &t->tm_mon, &t->tm_mday,
> &t->tm_hour, &t->tm_min, &t->tm_sec);
> #if 0
> - printk("mac_hwclk: read %04d-%02d-%-2d %02d:%02d:%02d\n",
> + pr_info("mac_hwclk: read %04d-%02d-%-2d %02d:%02d:%02d\n",
> t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
> t->tm_hour, t->tm_min, t->tm_sec);
> #endif
> } else { /* write */
> #if 0
> - printk("mac_hwclk: tried to write %04d-%02d-%-2d %02d:%02d:%02d\n",
> + pr_info("mac_hwclk: tried to write %04d-%02d-%-2d %02d:%02d:%02d\n",
> t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
> t->tm_hour, t->tm_min, t->tm_sec);
> #endif
>
These two can be changed to pr_debug() and the #if 0 removed. Since there
is no DEBUG macro definition here, I believe they will become no_printk()
and get checked by the compiler.
Thanks.
--
next prev parent reply other threads:[~2016-12-07 23:19 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 15:08 [PATCH 00/22] m68k: Modernize printing of kernel messages Geert Uytterhoeven
2016-12-07 15:08 ` [PATCH 01/22] m68k/atari: " Geert Uytterhoeven
2016-12-07 22:36 ` Finn Thain
2016-12-08 12:22 ` Geert Uytterhoeven
2016-12-08 22:55 ` Finn Thain
2016-12-10 0:44 ` Michael Schmitz
2017-02-09 11:59 ` Geert Uytterhoeven
2016-12-07 15:09 ` [PATCH 02/22] m68k/mac: macints - " Geert Uytterhoeven
2016-12-07 22:45 ` Finn Thain
2016-12-08 12:25 ` Geert Uytterhoeven
2016-12-08 23:11 ` Finn Thain
2016-12-07 15:09 ` [PATCH 03/22] m68k/mac: via " Geert Uytterhoeven
2016-12-07 22:48 ` Finn Thain
2016-12-07 15:09 ` [PATCH 04/22] m68k/68000: " Geert Uytterhoeven
2016-12-09 12:00 ` Greg Ungerer
2016-12-07 15:09 ` [PATCH 05/22] m68k/bvme6000: " Geert Uytterhoeven
2016-12-07 15:09 ` [PATCH 06/22] m68k/coldfire: " Geert Uytterhoeven
2016-12-07 22:53 ` Finn Thain
2016-12-09 12:09 ` Greg Ungerer
2016-12-07 15:09 ` [PATCH 07/22] m68k/mac: baboon - " Geert Uytterhoeven
2016-12-07 22:54 ` Finn Thain
2016-12-07 15:09 ` [PATCH 08/22] m68k/mac: iop " Geert Uytterhoeven
2016-12-07 23:06 ` Finn Thain
2016-12-07 15:09 ` [PATCH 09/22] m68k/mac: oss " Geert Uytterhoeven
2016-12-07 23:08 ` Finn Thain
2016-12-07 15:09 ` [PATCH 10/22] m68k/mac: psc " Geert Uytterhoeven
2016-12-07 23:10 ` Finn Thain
2016-12-07 15:09 ` [PATCH 11/22] m68k/mac: " Geert Uytterhoeven
2016-12-07 23:17 ` Finn Thain [this message]
2016-12-07 15:09 ` [PATCH 12/22] m68k/mvme147: " Geert Uytterhoeven
2016-12-07 15:09 ` [PATCH 13/22] m68k/mvme16x: " Geert Uytterhoeven
2016-12-07 15:09 ` [PATCH 14/22] m68k/q40: " Geert Uytterhoeven
2016-12-07 15:09 ` [PATCH 15/22] m68k/sun3: " Geert Uytterhoeven
2016-12-07 15:09 ` [PATCH 16/22] m68k/sun3x: " Geert Uytterhoeven
2016-12-07 15:09 ` [PATCH 17/22] m68k/kernel: " Geert Uytterhoeven
2016-12-07 15:09 ` [PATCH 18/22] m68k/mm: kmap - " Geert Uytterhoeven
2016-12-07 23:26 ` Finn Thain
2016-12-09 22:50 ` Finn Thain
2016-12-07 15:09 ` [PATCH 19/22] m68k/mm: motorola " Geert Uytterhoeven
2016-12-07 15:09 ` [PATCH 20/22] m68k/mm: sun3 " Geert Uytterhoeven
2016-12-07 15:09 ` [PATCH 21/22] m68k/mm: " Geert Uytterhoeven
2016-12-07 15:09 ` [PATCH 22/22] m68k/include: " Geert Uytterhoeven
2017-02-09 13:25 ` [PATCH 00/22] m68k: " Geert Uytterhoeven
2017-02-12 9:43 ` Geert Uytterhoeven
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=alpine.LNX.2.00.1612081012380.9219@nippy.intranet \
--to=fthain@telegraphics.com.au \
--cc=funaho@jurai.org \
--cc=geert@linux-m68k.org \
--cc=gerg@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=sammy@sammy.net \
/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;
as well as URLs for NNTP newsgroup(s).