Skip to content

Commit 937b5b5

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v4.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - kernel message modernizations and cleanups - defconfig updates - cleanups * tag 'm68k-for-v4.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/sun3: Remove dead code in paging_init() m68k/include: Modernize printing of kernel messages m68k/mm: Modernize printing of kernel messages m68k/mm: sun3 - Modernize printing of kernel messages m68k/kernel: Modernize printing of kernel messages m68k/sun3x: Modernize printing of kernel messages m68k/sun3: Modernize printing of kernel messages m68k/q40: Modernize printing of kernel messages m68k/mvme16x: Modernize printing of kernel messages m68k/mvme147: Modernize printing of kernel messages m68k/bvme6000: Modernize printing of kernel messages m68k/68000: Modernize printing of kernel messages m68k/atari: Modernize printing of kernel messages m68k: Delete an unnecessary variable assignment in sys_cacheflush() m68k/mac: Clean up interrupt debug macros and printk statements m68k/mac: Remove SHUTUP_SONIC interrupt hack m68k/mac: Improve NMI handler m68k/defconfig: Update defconfigs for v4.10-rc1 m68k/mac: Remove unneeded linux/miscdevice.h include
2 parents c945d02 + 3dfe330 commit 937b5b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+379
-405
lines changed

‎arch/m68k/68000/m68328.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ void m68328_reset (void)
4545

4646
void __init config_BSP(char *command, int len)
4747
{
48-
printk(KERN_INFO "\n68328 support D. Jeff Dionne <jeff@uclinux.org>\n");
49-
printk(KERN_INFO "68328 support Kenneth Albanowski <kjahds@kjshds.com>\n");
50-
printk(KERN_INFO "68328/Pilot support Bernhard Kuhn <kuhn@lpr.e-technik.tu-muenchen.de>\n");
48+
pr_info("68328 support D. Jeff Dionne <jeff@uclinux.org>\n");
49+
pr_info("68328 support Kenneth Albanowski <kjahds@kjshds.com>\n");
50+
pr_info("68328/Pilot support Bernhard Kuhn <kuhn@lpr.e-technik.tu-muenchen.de>\n");
5151

5252
mach_hwclk = m68328_hwclk;
5353
mach_reset = m68328_reset;

‎arch/m68k/68000/m68EZ328.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ void __init config_BSP(char *command, int len)
5757
{
5858
unsigned char *p;
5959

60-
printk(KERN_INFO "\n68EZ328 DragonBallEZ support (C) 1999 Rt-Control, Inc\n");
60+
pr_info("68EZ328 DragonBallEZ support (C) 1999 Rt-Control, Inc\n");
6161

6262
#ifdef CONFIG_UCSIMM
63-
printk(KERN_INFO "uCsimm serial string [%s]\n",getserialnum());
63+
pr_info("uCsimm serial string [%s]\n", getserialnum());
6464
p = cs8900a_hwaddr = gethwaddr(0);
65-
printk(KERN_INFO "uCsimm hwaddr %pM\n", p);
65+
pr_info("uCsimm hwaddr %pM\n", p);
6666

6767
p = getbenv("APPEND");
6868
if (p) strcpy(p,command);

‎arch/m68k/68000/m68VZ328.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ static void __init init_hardware(char *command, int size)
150150
{
151151
char *p;
152152

153-
printk(KERN_INFO "uCdimm serial string [%s]\n", getserialnum());
153+
pr_info("uCdimm serial string [%s]\n", getserialnum());
154154
p = cs8900a_hwaddr = gethwaddr(0);
155-
printk(KERN_INFO "uCdimm hwaddr %pM\n", p);
155+
pr_info("uCdimm hwaddr %pM\n", p);
156156
p = getbenv("APPEND");
157157
if (p)
158158
strcpy(p, command);
@@ -177,7 +177,7 @@ static void __init init_hardware(char *command, int size)
177177

178178
void __init config_BSP(char *command, int size)
179179
{
180-
printk(KERN_INFO "68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");
180+
pr_info("68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");
181181

182182
init_hardware(command, size);
183183

‎arch/m68k/atari/atakeyb.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ static irqreturn_t atari_keyboard_interrupt(int irq, void *dummy)
149149
if (acia_stat & ACIA_OVRN) {
150150
/* a very fast typist or a slow system, give a warning */
151151
/* ...happens often if interrupts were disabled for too long */
152-
printk(KERN_DEBUG "Keyboard overrun\n");
152+
pr_debug("Keyboard overrun\n");
153153
scancode = acia.key_data;
154154
if (ikbd_self_test)
155155
/* During self test, don't do resyncing, just process the code */
@@ -228,14 +228,14 @@ static irqreturn_t atari_keyboard_interrupt(int irq, void *dummy)
228228
keytyp = KTYP(keyval) - 0xf0;
229229
keyval = KVAL(keyval);
230230

231-
printk(KERN_WARNING "Key with scancode %d ", scancode);
231+
pr_warn("Key with scancode %d ", scancode);
232232
if (keytyp == KT_LATIN || keytyp == KT_LETTER) {
233233
if (keyval < ' ')
234-
printk("('^%c') ", keyval + '@');
234+
pr_cont("('^%c') ", keyval + '@');
235235
else
236-
printk("('%c') ", keyval);
236+
pr_cont("('%c') ", keyval);
237237
}
238-
printk("is broken -- will be ignored.\n");
238+
pr_cont("is broken -- will be ignored.\n");
239239
break;
240240
} else if (test_bit(scancode, broken_keys))
241241
break;
@@ -299,7 +299,7 @@ static irqreturn_t atari_keyboard_interrupt(int irq, void *dummy)
299299
#endif
300300

301301
if (acia_stat & (ACIA_FE | ACIA_PE)) {
302-
printk("Error in keyboard communication\n");
302+
pr_err("Error in keyboard communication\n");
303303
}
304304

305305
/* handle_scancode() can take a lot of time, so check again if
@@ -553,7 +553,7 @@ int atari_keyb_init(void)
553553
barrier();
554554
/* if not incremented: no 0xf1 received */
555555
if (ikbd_self_test == 1)
556-
printk(KERN_ERR "WARNING: keyboard self test failed!\n");
556+
pr_err("Keyboard self test failed!\n");
557557
ikbd_self_test = 0;
558558

559559
ikbd_mouse_disable();

‎arch/m68k/atari/config.c

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -234,44 +234,44 @@ void __init config_atari(void)
234234
* Determine hardware present
235235
*/
236236

237-
printk("Atari hardware found: ");
237+
pr_info("Atari hardware found:");
238238
if (MACH_IS_MEDUSA) {
239239
/* There's no Atari video hardware on the Medusa, but all the
240240
* addresses below generate a DTACK so no bus error occurs! */
241241
} else if (hwreg_present(f030_xreg)) {
242242
ATARIHW_SET(VIDEL_SHIFTER);
243-
printk("VIDEL ");
243+
pr_cont(" VIDEL");
244244
/* This is a temporary hack: If there is Falcon video
245245
* hardware, we assume that the ST-DMA serves SCSI instead of
246246
* ACSI. In the future, there should be a better method for
247247
* this...
248248
*/
249249
ATARIHW_SET(ST_SCSI);
250-
printk("STDMA-SCSI ");
250+
pr_cont(" STDMA-SCSI");
251251
} else if (hwreg_present(tt_palette)) {
252252
ATARIHW_SET(TT_SHIFTER);
253-
printk("TT_SHIFTER ");
253+
pr_cont(" TT_SHIFTER");
254254
} else if (hwreg_present(&shifter.bas_hi)) {
255255
if (hwreg_present(&shifter.bas_lo) &&
256256
(shifter.bas_lo = 0x0aau, shifter.bas_lo == 0x0aau)) {
257257
ATARIHW_SET(EXTD_SHIFTER);
258-
printk("EXTD_SHIFTER ");
258+
pr_cont(" EXTD_SHIFTER");
259259
} else {
260260
ATARIHW_SET(STND_SHIFTER);
261-
printk("STND_SHIFTER ");
261+
pr_cont(" STND_SHIFTER");
262262
}
263263
}
264264
if (hwreg_present(&st_mfp.par_dt_reg)) {
265265
ATARIHW_SET(ST_MFP);
266-
printk("ST_MFP ");
266+
pr_cont(" ST_MFP");
267267
}
268268
if (hwreg_present(&tt_mfp.par_dt_reg)) {
269269
ATARIHW_SET(TT_MFP);
270-
printk("TT_MFP ");
270+
pr_cont(" TT_MFP");
271271
}
272272
if (hwreg_present(&tt_scsi_dma.dma_addr_hi)) {
273273
ATARIHW_SET(SCSI_DMA);
274-
printk("TT_SCSI_DMA ");
274+
pr_cont(" TT_SCSI_DMA");
275275
}
276276
/*
277277
* The ST-DMA address registers aren't readable
@@ -284,27 +284,27 @@ void __init config_atari(void)
284284
(st_dma.dma_vhi = 0xaa) && (st_dma.dma_hi = 0x55) &&
285285
st_dma.dma_vhi == 0xaa && st_dma.dma_hi == 0x55)) {
286286
ATARIHW_SET(EXTD_DMA);
287-
printk("EXTD_DMA ");
287+
pr_cont(" EXTD_DMA");
288288
}
289289
if (hwreg_present(&tt_scsi.scsi_data)) {
290290
ATARIHW_SET(TT_SCSI);
291-
printk("TT_SCSI ");
291+
pr_cont(" TT_SCSI");
292292
}
293293
if (hwreg_present(&sound_ym.rd_data_reg_sel)) {
294294
ATARIHW_SET(YM_2149);
295-
printk("YM2149 ");
295+
pr_cont(" YM2149");
296296
}
297297
if (!MACH_IS_MEDUSA && hwreg_present(&tt_dmasnd.ctrl)) {
298298
ATARIHW_SET(PCM_8BIT);
299-
printk("PCM ");
299+
pr_cont(" PCM");
300300
}
301301
if (hwreg_present(&falcon_codec.unused5)) {
302302
ATARIHW_SET(CODEC);
303-
printk("CODEC ");
303+
pr_cont(" CODEC");
304304
}
305305
if (hwreg_present(&dsp56k_host_interface.icr)) {
306306
ATARIHW_SET(DSP56K);
307-
printk("DSP56K ");
307+
pr_cont(" DSP56K");
308308
}
309309
if (hwreg_present(&tt_scc_dma.dma_ctrl) &&
310310
#if 0
@@ -316,33 +316,33 @@ void __init config_atari(void)
316316
#endif
317317
) {
318318
ATARIHW_SET(SCC_DMA);
319-
printk("SCC_DMA ");
319+
pr_cont(" SCC_DMA");
320320
}
321321
if (scc_test(&atari_scc.cha_a_ctrl)) {
322322
ATARIHW_SET(SCC);
323-
printk("SCC ");
323+
pr_cont(" SCC");
324324
}
325325
if (scc_test(&st_escc.cha_b_ctrl)) {
326326
ATARIHW_SET(ST_ESCC);
327-
printk("ST_ESCC ");
327+
pr_cont(" ST_ESCC");
328328
}
329329
if (hwreg_present(&tt_scu.sys_mask)) {
330330
ATARIHW_SET(SCU);
331331
/* Assume a VME bus if there's a SCU */
332332
ATARIHW_SET(VME);
333-
printk("VME SCU ");
333+
pr_cont(" VME SCU");
334334
}
335335
if (hwreg_present((void *)(0xffff9210))) {
336336
ATARIHW_SET(ANALOG_JOY);
337-
printk("ANALOG_JOY ");
337+
pr_cont(" ANALOG_JOY");
338338
}
339339
if (hwreg_present(blitter.halftone)) {
340340
ATARIHW_SET(BLITTER);
341-
printk("BLITTER ");
341+
pr_cont(" BLITTER");
342342
}
343343
if (hwreg_present((void *)0xfff00039)) {
344344
ATARIHW_SET(IDE);
345-
printk("IDE ");
345+
pr_cont(" IDE");
346346
}
347347
#if 1 /* This maybe wrong */
348348
if (!MACH_IS_MEDUSA && hwreg_present(&tt_microwire.data) &&
@@ -355,31 +355,31 @@ void __init config_atari(void)
355355
ATARIHW_SET(MICROWIRE);
356356
while (tt_microwire.mask != 0x7ff)
357357
;
358-
printk("MICROWIRE ");
358+
pr_cont(" MICROWIRE");
359359
}
360360
#endif
361361
if (hwreg_present(&tt_rtc.regsel)) {
362362
ATARIHW_SET(TT_CLK);
363-
printk("TT_CLK ");
363+
pr_cont(" TT_CLK");
364364
mach_hwclk = atari_tt_hwclk;
365365
mach_set_clock_mmss = atari_tt_set_clock_mmss;
366366
}
367367
if (hwreg_present(&mste_rtc.sec_ones)) {
368368
ATARIHW_SET(MSTE_CLK);
369-
printk("MSTE_CLK ");
369+
pr_cont(" MSTE_CLK");
370370
mach_hwclk = atari_mste_hwclk;
371371
mach_set_clock_mmss = atari_mste_set_clock_mmss;
372372
}
373373
if (!MACH_IS_MEDUSA && hwreg_present(&dma_wd.fdc_speed) &&
374374
hwreg_write(&dma_wd.fdc_speed, 0)) {
375375
ATARIHW_SET(FDCSPEED);
376-
printk("FDC_SPEED ");
376+
pr_cont(" FDC_SPEED");
377377
}
378378
if (!ATARIHW_PRESENT(ST_SCSI)) {
379379
ATARIHW_SET(ACSI);
380-
printk("ACSI ");
380+
pr_cont(" ACSI");
381381
}
382-
printk("\n");
382+
pr_cont("\n");
383383

384384
if (CPU_IS_040_OR_060)
385385
/* Now it seems to be safe to turn of the tt0 transparent

‎arch/m68k/bvme6000/config.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ void bvme6000_reset(void)
6363
{
6464
volatile PitRegsPtr pit = (PitRegsPtr)BVME_PIT_BASE;
6565

66-
printk ("\r\n\nCalled bvme6000_reset\r\n"
67-
"\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r");
66+
pr_info("\r\n\nCalled bvme6000_reset\r\n"
67+
"\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r");
6868
/* The string of returns is to delay the reset until the whole
6969
* message is output. */
7070
/* Enable the watchdog, via PIT port C bit 4 */
@@ -117,8 +117,8 @@ void __init config_bvme6000(void)
117117
mach_reset = bvme6000_reset;
118118
mach_get_model = bvme6000_get_model;
119119

120-
printk ("Board is %sconfigured as a System Controller\n",
121-
*config_reg_ptr & BVME_CONFIG_SW1 ? "" : "not ");
120+
pr_info("Board is %sconfigured as a System Controller\n",
121+
*config_reg_ptr & BVME_CONFIG_SW1 ? "" : "not ");
122122

123123
/* Now do the PIT configuration */
124124

‎arch/m68k/bvme6000/rtc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ static int __init rtc_DP8570A_init(void)
168168
if (!MACH_IS_BVME6000)
169169
return -ENODEV;
170170

171-
printk(KERN_INFO "DP8570A Real Time Clock Driver v%s\n", RTC_VERSION);
171+
pr_info("DP8570A Real Time Clock Driver v%s\n", RTC_VERSION);
172172
return misc_register(&rtc_dev);
173173
}
174174
module_init(rtc_DP8570A_init);

0 commit comments

Comments
 (0)