Skip to content

Commit

Permalink
ASoC: rt1015: remove unneeded variables in rt1015_priv
Browse files Browse the repository at this point in the history
- `lrck' is only used in .hw_params callback so that it can be local.
- `bclk' is unused.
- `id' is unused.
- `amp_ver' is unused.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20201224100607.3006171-6-tzungbi@google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Tzung-Bi Shih authored and Mark Brown committed Dec 29, 2020
1 parent 3128f1c commit a5db2ca
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
9 changes: 4 additions & 5 deletions sound/soc/codecs/rt1015.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,11 +704,11 @@ static int rt1015_hw_params(struct snd_pcm_substream *substream,
{
struct snd_soc_component *component = dai->component;
struct rt1015_priv *rt1015 = snd_soc_component_get_drvdata(component);
int pre_div, bclk_ms, frame_size;
int pre_div, bclk_ms, frame_size, lrck;
unsigned int val_len = 0;

rt1015->lrck = params_rate(params);
pre_div = rl6231_get_clk_info(rt1015->sysclk, rt1015->lrck);
lrck = params_rate(params);
pre_div = rl6231_get_clk_info(rt1015->sysclk, lrck);
if (pre_div < 0) {
dev_err(component->dev, "Unsupported clock rate\n");
return -EINVAL;
Expand All @@ -722,13 +722,12 @@ static int rt1015_hw_params(struct snd_pcm_substream *substream,
}

bclk_ms = frame_size > 32;
rt1015->bclk = rt1015->lrck * (32 << bclk_ms);

dev_dbg(component->dev, "bclk_ms is %d and pre_div is %d for iis %d\n",
bclk_ms, pre_div, dai->id);

dev_dbg(component->dev, "lrck is %dHz and pre_div is %d for iis %d\n",
rt1015->lrck, pre_div, dai->id);
lrck, pre_div, dai->id);

switch (params_width(params)) {
case 16:
Expand Down
4 changes: 0 additions & 4 deletions sound/soc/codecs/rt1015.h
Original file line number Diff line number Diff line change
Expand Up @@ -427,16 +427,12 @@ struct rt1015_priv {
struct regmap *regmap;
int sysclk;
int sysclk_src;
int lrck;
int bclk;
int bclk_ratio;
int id;
int pll_src;
int pll_in;
int pll_out;
int boost_mode;
int bypass_boost;
int amp_ver;
int dac_is_used;
int cali_done;
int hw_config;
Expand Down

0 comments on commit a5db2ca

Please sign in to comment.