From: Peter Ujfalusi Date: Thu, 20 Jun 2019 09:26:55 +0000 (+0300) Subject: ASoC: pcm3168a: Rename min_frame_size to slot_width X-Git-Tag: v5.3-rc1~168^2~7^2~1^2~104 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5d8dffb8cc9792c3bb4310e142932c8bc5c0387;p=thirdparty%2Flinux.git ASoC: pcm3168a: Rename min_frame_size to slot_width It represents slot size and not frame. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index 9eb24ca097933..e1658947090b0 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -435,7 +435,7 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream, u32 val, mask, shift, reg; unsigned int rate, fmt, ratio, max_ratio; unsigned int chan; - int i, min_frame_size; + int i, slot_width; rate = params_rate(params); chan = params_channels(params); @@ -470,11 +470,11 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream, } if (pcm3168a->slot_width) - min_frame_size = pcm3168a->slot_width; + slot_width = pcm3168a->slot_width; else - min_frame_size = params_width(params); + slot_width = params_width(params); - switch (min_frame_size) { + switch (slot_width) { case 16: if (master_mode || (fmt != PCM3168A_FMT_RIGHT_J)) { dev_err(component->dev, "16-bit slots are supported only for slave mode using right justified\n"); @@ -491,7 +491,7 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream, case 32: break; default: - dev_err(component->dev, "unsupported frame size: %d\n", min_frame_size); + dev_err(component->dev, "unsupported frame size: %d\n", slot_width); return -EINVAL; }