Commit 7585a5b0 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm_adsp: Fixup some minor formatting and checkpatch errors 



Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d27c5e15

sound/soc/codecs/wm_adsp.c

+13 −14
Original line number Diff line number Diff line
@@ -543,10 +543,10 @@ static void wm_adsp2_show_fw_status(struct wm_adsp *dsp) 
		 be16_to_cpu(scratch[3]));

}



static int wm_coeff_info(struct snd_kcontrol *kcontrol,

static int wm_coeff_info(struct snd_kcontrol *kctl,

			 struct snd_ctl_elem_info *uinfo)

{

	struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kcontrol->private_value;

	struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kctl->private_value;



	uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;

	uinfo->count = ctl->len;
@@ -592,10 +592,10 @@ static int wm_coeff_write_control(struct wm_coeff_ctl *ctl, 
	return 0;

}



static int wm_coeff_put(struct snd_kcontrol *kcontrol,

static int wm_coeff_put(struct snd_kcontrol *kctl,

			struct snd_ctl_elem_value *ucontrol)

{

	struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kcontrol->private_value;

	struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kctl->private_value;

	char *p = ucontrol->value.bytes.data;



	memcpy(ctl->cache, p, ctl->len);
@@ -646,10 +646,10 @@ static int wm_coeff_read_control(struct wm_coeff_ctl *ctl, 
	return 0;

}



static int wm_coeff_get(struct snd_kcontrol *kcontrol,

static int wm_coeff_get(struct snd_kcontrol *kctl,

			struct snd_ctl_elem_value *ucontrol)

{

	struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kcontrol->private_value;

	struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kctl->private_value;

	char *p = ucontrol->value.bytes.data;



	if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) {
@@ -828,8 +828,7 @@ static int wm_adsp_create_control(struct wm_adsp *dsp, 
		break;

	}



	list_for_each_entry(ctl, &dsp->ctl_list,

			    list) {

	list_for_each_entry(ctl, &dsp->ctl_list, list) {

		if (!strcmp(ctl->name, name)) {

			if (!ctl->enabled)

				ctl->enabled = 1;
@@ -1814,7 +1813,7 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w, 
	struct wm_adsp_alg_region *alg_region;

	struct wm_coeff_ctl *ctl;

	int ret;

	int val;

	unsigned int val;



	dsp->card = codec->component.card;

sound/soc/codecs/wm_adsp.h

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ struct wm_adsp { 


	struct list_head alg_regions;



	int fw_id;

	int fw_id_version;

	unsigned int fw_id;

	unsigned int fw_id_version;



	const struct wm_adsp_region *mem;

	int num_mems;