[ALSA] Add missing KERN_* prefix (d3d579f8) · Commits · 戴 / test

sound/core/oss/mixer_oss.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1294,7 +1294,8 @@ static int snd_mixer_oss_notify_handler(snd_card_t * card, int cmd)
		card, 0,
		&snd_mixer_oss_reg,
		name)) < 0) {
		snd_printk("unable to register OSS mixer device %i:%i\n", card->number, 0);
		snd_printk(KERN_ERR "unable to register OSS mixer device %i:%i\n",
		card->number, 0);
		kfree(mixer);
		return err;
		}

+6 −3

Original line number	Diff line number	Diff line
		@@ -2457,7 +2457,8 @@ static void register_oss_dsp(snd_pcm_t *pcm, int index)
		if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_PCM,
		pcm->card, index, &snd_pcm_oss_reg,
		name) < 0) {
		snd_printk("unable to register OSS PCM device %i:%i\n", pcm->card->number, pcm->device);
		snd_printk(KERN_ERR "unable to register OSS PCM device %i:%i\n",
		pcm->card->number, pcm->device);
		}
		}

		@@ -2539,11 +2540,13 @@ static int __init alsa_pcm_oss_init(void)
		/* check device map table */
		for (i = 0; i < SNDRV_CARDS; i++) {
		if (dsp_map[i] < 0 \|\| dsp_map[i] >= SNDRV_PCM_DEVICES) {
		snd_printk("invalid dsp_map[%d] = %d\n", i, dsp_map[i]);
		snd_printk(KERN_ERR "invalid dsp_map[%d] = %d\n",
		i, dsp_map[i]);
		dsp_map[i] = 0;
		}
		if (adsp_map[i] < 0 \|\| adsp_map[i] >= SNDRV_PCM_DEVICES) {
		snd_printk("invalid adsp_map[%d] = %d\n", i, adsp_map[i]);
		snd_printk(KERN_ERR "invalid adsp_map[%d] = %d\n",
		i, adsp_map[i]);
		adsp_map[i] = 1;
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -911,7 +911,7 @@ static void build_feature_ctl(mixer_build_t state, unsigned char desc,
		case USB_ID(0x0672, 0x1041):
		if (!strcmp(kctl->id.name, "PCM Playback Volume") &&
		cval->min == -15616) {
		snd_printk("using volume control quirk for the UDA1321/N101 chip\n");
		snd_printk(KERN_INFO "using volume control quirk for the UDA1321/N101 chip\n");
		cval->max = -256;
		}
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -193,7 +193,7 @@ static int usX2Y_create_alsa_devices(snd_card_t* card)

		do {
		if ((err = usX2Y_create_usbmidi(card)) < 0) {
		snd_printk("usX2Y_create_alsa_devices: usX2Y_create_usbmidi error %i \n", err);
		snd_printk(KERN_ERR "usX2Y_create_alsa_devices: usX2Y_create_usbmidi error %i \n", err);
		break;
		}
		if ((err = usX2Y_audio_create(card)) < 0)
		@@ -224,7 +224,7 @@ static int snd_usX2Y_hwdep_dsp_load(snd_hwdep_t hw, snd_hwdep_dsp_image_t dsp)
		}
		err = usb_set_interface(dev, 0, 1);
		if (err)
		snd_printk("usb_set_interface error \n");
		snd_printk(KERN_ERR "usb_set_interface error \n");
		else
		err = usb_bulk_msg(dev, usb_sndbulkpipe(dev, 2), buf, dsp->length, &lret, 6000);
		kfree(buf);
		@@ -235,17 +235,17 @@ static int snd_usX2Y_hwdep_dsp_load(snd_hwdep_t hw, snd_hwdep_dsp_image_t dsp)
		msleep(250); // give the device some time
		err = usX2Y_AsyncSeq04_init(priv);
		if (err) {
		snd_printk("usX2Y_AsyncSeq04_init error \n");
		snd_printk(KERN_ERR "usX2Y_AsyncSeq04_init error \n");
		return err;
		}
		err = usX2Y_In04_init(priv);
		if (err) {
		snd_printk("usX2Y_In04_init error \n");
		snd_printk(KERN_ERR "usX2Y_In04_init error \n");
		return err;
		}
		err = usX2Y_create_alsa_devices(hw->card);
		if (err) {
		snd_printk("usX2Y_create_alsa_devices error %i \n", err);
		snd_printk(KERN_ERR "usX2Y_create_alsa_devices error %i \n", err);
		snd_card_free(hw->card);
		return err;
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -251,9 +251,8 @@ static void i_usX2Y_In04Int(struct urb* urb, struct pt_regs *regs)
		}
		}

		if (err) {
		snd_printk("In04Int() usb_submit_urb err=%i\n", err);
		}
		if (err)
		snd_printk(KERN_ERR "In04Int() usb_submit_urb err=%i\n", err);

		urb->dev = usX2Y->chip.dev;
		usb_submit_urb(urb, GFP_ATOMIC);