summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8997.c
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.cirrus.com>2018-02-20 16:08:11 +0000
committerMark Brown <broonie@kernel.org>2018-02-21 11:20:33 +0000
commit7dd0f7ca5f23a9c8b4a5b69587b41b413b2ecc2d (patch)
tree3024e76326a1b45dad1e0ce656ca91ee5e15b936 /sound/soc/codecs/wm8997.c
parent0fe1daa6663ae9437c7168b81fe23c9ed50f55df (diff)
downloadlinux-7dd0f7ca5f23a9c8b4a5b69587b41b413b2ecc2d.tar.bz2
ASoC: arizona: Fixup some minor formatting issues
Repair any formatting/style issues that can be fixed without major code refactoring. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm8997.c')
-rw-r--r--sound/soc/codecs/wm8997.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 45ee1e6bf715..df5b36b8fc5a 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -118,7 +118,7 @@ static int wm8997_sysclk_ev(struct snd_soc_dapm_widget *w,
return arizona_dvfs_sysclk_ev(w, kcontrol, event);
}
-static const char *wm8997_osr_text[] = {
+static const char * const wm8997_osr_text[] = {
"Low power", "Normal", "High performance",
};
@@ -609,8 +609,7 @@ SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0,
ARIZONA_SLIMRX8_ENA_SHIFT, 0),
SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
- ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0,
- &wm8997_aec_loopback_mux),
+ ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, &wm8997_aec_loopback_mux),
SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,
@@ -927,8 +926,8 @@ static const struct snd_soc_dapm_route wm8997_dapm_routes[] = {
{ "MICSUPP", NULL, "SYSCLK" },
};
-static int wm8997_set_fll(struct snd_soc_component *component, int fll_id, int source,
- unsigned int Fref, unsigned int Fout)
+static int wm8997_set_fll(struct snd_soc_component *component, int fll_id,
+ int source, unsigned int Fref, unsigned int Fout)
{
struct wm8997_priv *wm8997 = snd_soc_component_get_drvdata(component);
@@ -1173,8 +1172,9 @@ static int wm8997_probe(struct platform_device *pdev)
return ret;
ret = devm_snd_soc_register_component(&pdev->dev,
- &soc_component_dev_wm8997,
- wm8997_dai, ARRAY_SIZE(wm8997_dai));
+ &soc_component_dev_wm8997,
+ wm8997_dai,
+ ARRAY_SIZE(wm8997_dai));
if (ret < 0) {
dev_err(&pdev->dev, "Failed to register component: %d\n", ret);
goto err_spk_irqs;