Skip to contentSkip to conversation

Put missing KERN_* prefix

PATCH New Takashi Iwai 1 participant 7 messages Aug 31, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Put missing KERN_* prefix

Hi,

it's a trivial fix patch set for missing KERN_* prefix to some debug codes found in various drivers.

Takashi

===

Takashi Iwai (6):
ALSA: opl3: Put missing KERN_CONT prefix
ALSA: vx: Put missing KERN_CONT prefix
ALSA: asihpi: Put missing KERN_CONT prefix
ALSA: usb-audio: Put missing KERN_CONT prefix
ALSA: usx2y: Put missing KERN_CONT prefix
ALSA: sh: Put missing KERN_* prefix

 sound/drivers/opl3/opl3_midi.c | 4 ++--
 sound/drivers/vx/vx_core.c     | 4 ++--
 sound/pci/asihpi/hpidebug.c    | 4 ++--
 sound/sh/sh_dac_audio.c        | 2 +-
 sound/usb/midi.c               | 4 ++--
 sound/usb/usx2y/usb_stream.c   | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/6 ALSA: opl3: Put missing KERN_CONT prefix

The opl3 driver has a debug printk code without proper KERN_ prefix. On recent kernels, KERN_CONT prefix is mandatory for continued output lines. Put it properly.

---
 sound/drivers/opl3/opl3_midi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/drivers/opl3/opl3_midi.c +2 -2
index 7821b07415a7..13c0a7e1bc2b 100644
@@ -131,8 +131,8 @@ static void debug_alloc(struct snd_opl3 *opl3, char *s, int voice) {
 
 	printk(KERN_DEBUG "time %.5i: %s [%.2i]: ", opl3->use_time, s, voice);
 	for (i = 0; i < opl3->max_voices; i++)
-		printk("%c", *(str + opl3->voices[i].state + 1));
-	printk("\n");
+		printk(KERN_CONT "%c", *(str + opl3->voices[i].state + 1));
+	printk(KERN_CONT "\n");
 }
 #endif
 
Signature · 1 line
2.14.1
#2 lore raw

PATCH 2/6 ALSA: vx: Put missing KERN_CONT prefix

In reply to Takashi Iwai

The vx driver has a debug printk code without proper KERN_ prefix. On recent kernels, KERN_CONT prefix is mandatory for continued output lines. Put it properly.

---
 sound/drivers/vx/vx_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/drivers/vx/vx_core.c +2 -2
index f684fffd1397..121357397a6d 100644
@@ -256,8 +256,8 @@ int vx_send_msg_nolock(struct vx_core *chip, struct vx_rmh *rmh)
 	if (rmh->LgCmd > 1) {
 		printk(KERN_DEBUG "  ");
 		for (i = 1; i < rmh->LgCmd; i++)
-			printk("0x%06x ", rmh->Cmd[i]);
-		printk("\n");
+			printk(KERN_CONT "0x%06x ", rmh->Cmd[i]);
+		printk(KERN_CONT "\n");
 	}
 #endif
 	/* Check bit M is set according to length of the command */
Signature · 1 line
2.14.1
#3 lore raw

PATCH 3/6 ALSA: asihpi: Put missing KERN_CONT prefix

In reply to Takashi Iwai

The asihpi driver has a debug printk code without proper KERN_ prefix. On recent kernels, KERN_CONT prefix is mandatory for continued output lines. Put it properly.

---
 sound/pci/asihpi/hpidebug.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/asihpi/hpidebug.c +2 -2
index ac86a1f1d3bf..9e122327dc05 100644
@@ -71,8 +71,8 @@ void hpi_debug_data(u16 *pdata, u32 len)
 		printk(KERN_DEBUG "%p:", (pdata + i));
 
 		for (k = 0; k < cols && i < len; i++, k++)
-			printk("%s%04x", k == 0 ? "" : " ", pdata[i]);
+			printk(KERN_CONT "%s%04x", k == 0 ? "" : " ", pdata[i]);
 
-		printk("\n");
+		printk(KERN_CONT "\n");
 	}
 }
Signature · 1 line
2.14.1
#4 lore raw

PATCH 4/6 ALSA: usb-audio: Put missing KERN_CONT prefix

In reply to Takashi Iwai

The usb-audio driver has a debug printk code without proper KERN_ prefix. On recent kernels, KERN_CONT prefix is mandatory for continued output lines. Put it properly.

---
 sound/usb/midi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/usb/midi.c +2 -2
index bd9d02268724..a92e2b2a91ec 100644
@@ -242,8 +242,8 @@ static void dump_urb(const char *type, const u8 *data, int length)
 {
 	snd_printk(KERN_DEBUG "%s packet: [", type);
 	for (; length > 0; ++data, --length)
-		printk(" %02x", *data);
-	printk(" ]\n");
+		printk(KERN_CONT " %02x", *data);
+	printk(KERN_CONT " ]\n");
 }
 #else
 #define dump_urb(type, data, length) /* nothing */
Signature · 1 line
2.14.1
#5 lore raw

PATCH 5/6 ALSA: usx2y: Put missing KERN_CONT prefix

In reply to Takashi Iwai

The usx2y driver has a debug printk code without proper KERN_ prefix. On recent kernels, KERN_CONT prefix is mandatory for continued output lines. Put it properly.

---
 sound/usb/usx2y/usb_stream.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/usb/usx2y/usb_stream.c +2 -2
index bf618e1500ac..fe926cb9192e 100644
@@ -625,9 +625,9 @@ static void i_capture_start(struct urb *urb)
 		       urb->iso_frame_desc[0].actual_length);
 		for (pack = 1; pack < urb->number_of_packets; ++pack) {
 			int l = urb->iso_frame_desc[pack].actual_length;
-			printk(" %i", l);
+			printk(KERN_CONT " %i", l);
 		}
-		printk("\n");
+		printk(KERN_CONT "\n");
 	}
 #endif
 	if (!empty && s->state < usb_stream_sync1)
Signature · 1 line
2.14.1
#6 lore raw

PATCH 6/6 ALSA: sh: Put missing KERN_* prefix

In reply to Takashi Iwai

sh audio driver prints its presence at probe function but a proper KERN_ prefix is missing. Put KERN_INFO there as it's merely an advertisement.

---
 sound/sh/sh_dac_audio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/sh/sh_dac_audio.c +1 -1
index e71e6a718802..834b2574786f 100644
@@ -424,7 +424,7 @@ static int snd_sh_dac_probe(struct platform_device *devptr)
 	if (err < 0)
 		goto probe_error;
 
-	snd_printk("ALSA driver for SuperH DAC audio");
+	snd_printk(KERN_INFO "ALSA driver for SuperH DAC audio");
 
 	platform_set_drvdata(devptr, card);
 	return 0;
Signature · 1 line
2.14.1