Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6da67113 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: powermac - Add missing KERN_* prefix to printk 



Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent dca7c741

sound/ppc/daca.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int daca_set_volume(struct pmac_daca *mix) 
	data[1] |= mix->deemphasis ? 0x40 : 0;

	if (i2c_smbus_write_block_data(mix->i2c.client, DACA_REG_AVOL,

				       2, data) < 0) {

		snd_printk("failed to set volume \n");

		snd_printk(KERN_ERR "failed to set volume \n");

		return -EINVAL;

	}

	return 0;

sound/ppc/pmac.c

+4 −4
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static int snd_pmac_pcm_trigger(struct snd_pmac *chip, struct pmac_stream *rec, 
	case SNDRV_PCM_TRIGGER_SUSPEND:

		spin_lock(&chip->reg_lock);

		rec->running = 0;

		/*printk("stopped!!\n");*/

		/*printk(KERN_DEBUG "stopped!!\n");*/

		snd_pmac_dma_stop(rec);

		for (i = 0, cp = rec->cmd.cmds; i < rec->nperiods; i++, cp++)

			out_le16(&cp->command, DBDMA_STOP);
@@ -334,7 +334,7 @@ static snd_pcm_uframes_t snd_pmac_pcm_pointer(struct snd_pmac *chip, 
	}

#endif

	count += rec->cur_period * rec->period_size;

	/*printk("pointer=%d\n", count);*/

	/*printk(KERN_DEBUG "pointer=%d\n", count);*/

	return bytes_to_frames(subs->runtime, count);

}
@@ -486,7 +486,7 @@ static void snd_pmac_pcm_update(struct snd_pmac *chip, struct pmac_stream *rec) 
			if (! (stat & ACTIVE))

				break;



			/*printk("update frag %d\n", rec->cur_period);*/

			/*printk(KERN_DEBUG "update frag %d\n", rec->cur_period);*/

			st_le16(&cp->xfer_status, 0);

			st_le16(&cp->req_count, rec->period_size);

			/*st_le16(&cp->res_count, 0);*/
@@ -806,7 +806,7 @@ snd_pmac_ctrl_intr(int irq, void *devid) 
	struct snd_pmac *chip = devid;

	int ctrl = in_le32(&chip->awacs->control);



	/*printk("pmac: control interrupt.. 0x%x\n", ctrl);*/

	/*printk(KERN_DEBUG "pmac: control interrupt.. 0x%x\n", ctrl);*/

	if (ctrl & MASK_PORTCHG) {

		/* do something when headphone is plugged/unplugged? */

		if (chip->update_automute)

sound/ppc/powermac.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int __init snd_pmac_probe(struct platform_device *devptr) 
			goto __error;

		break;

	default:

		snd_printk("unsupported hardware %d\n", chip->model);

		snd_printk(KERN_ERR "unsupported hardware %d\n", chip->model);

		err = -EINVAL;

		goto __error;

	}

sound/ppc/tumbler.c

+7 −6
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#undef DEBUG



#ifdef DEBUG

#define DBG(fmt...) printk(fmt)

#define DBG(fmt...) printk(KERN_DEBUG fmt)

#else

#define DBG(fmt...)

#endif
@@ -240,7 +240,7 @@ static int tumbler_set_master_volume(struct pmac_tumbler *mix) 
  

	if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_VOL, 6,

					   block) < 0) {

		snd_printk("failed to set volume \n");

		snd_printk(KERN_ERR "failed to set volume \n");

		return -EINVAL;

	}

	return 0;
@@ -350,7 +350,7 @@ static int tumbler_set_drc(struct pmac_tumbler *mix) 


	if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC,

					   2, val) < 0) {

		snd_printk("failed to set DRC\n");

		snd_printk(KERN_ERR "failed to set DRC\n");

		return -EINVAL;

	}

	return 0;
@@ -386,7 +386,7 @@ static int snapper_set_drc(struct pmac_tumbler *mix) 


	if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC,

					   6, val) < 0) {

		snd_printk("failed to set DRC\n");

		snd_printk(KERN_ERR "failed to set DRC\n");

		return -EINVAL;

	}

	return 0;
@@ -506,7 +506,8 @@ static int tumbler_set_mono_volume(struct pmac_tumbler *mix, 
		block[i] = (vol >> ((info->bytes - i - 1) * 8)) & 0xff;

	if (i2c_smbus_write_i2c_block_data(mix->i2c.client, info->reg,

					   info->bytes, block) < 0) {

		snd_printk("failed to set mono volume %d\n", info->index);

		snd_printk(KERN_ERR "failed to set mono volume %d\n",

			   info->index);

		return -EINVAL;

	}

	return 0;
@@ -643,7 +644,7 @@ static int snapper_set_mix_vol1(struct pmac_tumbler *mix, int idx, int ch, int r 
	}

	if (i2c_smbus_write_i2c_block_data(mix->i2c.client, reg,

					   9, block) < 0) {

		snd_printk("failed to set mono volume %d\n", reg);

		snd_printk(KERN_ERR "failed to set mono volume %d\n", reg);

		return -EINVAL;

	}

	return 0;