projects/linux·commit 709c12e3

Merge tag 'm68k-for-v4.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

709c12e3 · Linus Torvalds <[email protected]> · 2016-12-12 08:48:28 -08:00

Pull m68k updates from Geert Uytterhoeven:
 "Use seq_puts() for fixed strings"

* tag 'm68k-for-v4.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/atari: Use seq_puts() in atari_get_hardware_list()
  m68k/amiga: Use seq_puts() in amiga_get_hardware_list()
Commit
709c12e3f5c5f3efd11d3fbd43d35535dc3a34d0
Parents
669bb4c5 · ad595b77

Merge commit. Changes below are compared with the first parent: 669bb4c5.

Changes

2 files changed · +2 −3

FileStatusAddDelContent
arch/m68k/amiga/config.cmodified+1−2View file
arch/m68k/atari/config.cmodified+1−1View file

arch/m68k/amiga/config.c

View file
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index ddb8192..65f63a4 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -786,8 +786,7 @@ static void amiga_get_hardware_list(struct seq_file *m)
if (AMIGAHW_PRESENT(name)) \
seq_printf (m, "\t%s\n", str)
- seq_printf (m, "Detected hardware:\n");
-
+ seq_puts(m, "Detected hardware:\n");
AMIGAHW_ANNOUNCE(AMI_VIDEO, "Amiga Video");
AMIGAHW_ANNOUNCE(AMI_BLITTER, "Blitter");
AMIGAHW_ANNOUNCE(AMBER_FF, "Amber Flicker Fixer");

arch/m68k/atari/config.c

View file
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 97a3c38..e328eaf 100644
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -629,7 +629,7 @@ static void atari_get_hardware_list(struct seq_file *m)
if (ATARIHW_PRESENT(name)) \
seq_printf(m, "\t%s\n", str)
- seq_printf(m, "Detected hardware:\n");
+ seq_puts(m, "Detected hardware:\n");
ATARIHW_ANNOUNCE(STND_SHIFTER, "ST Shifter");
ATARIHW_ANNOUNCE(EXTD_SHIFTER, "STe Shifter");
ATARIHW_ANNOUNCE(TT_SHIFTER, "TT Shifter");