summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-09-04 18:13:29 +0200
committerTakashi Iwai <tiwai@suse.de>2017-09-04 18:13:29 +0200
commitee5f38a4459a453ba5d5bdacdcffdf408548338f (patch)
tree93fd60ab5725b1a30e0fafa118678366e54508c8 /sound/soc
parentcc91ceaf3efd9a2364463b5f85d9f391f1ddaa9d (diff)
parent7051334672e54fae67e02d5d3296fb62b3343be7 (diff)
downloadlinux-ee5f38a4459a453ba5d5bdacdcffdf408548338f.tar.bz2
Merge tag 'asoc-v4.14-cs43130' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for the CS43130 driver A couple of warning fixes for the newly added CS43130 driver.
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/cs43130.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c
index 220e30199c5b..643e37fc218e 100644
--- a/sound/soc/codecs/cs43130.c
+++ b/sound/soc/codecs/cs43130.c
@@ -2079,6 +2079,10 @@ static void cs43130_imp_meas(struct work_struct *wk)
case CS43131_CHIP_ID:
hpload_seq = hpload_seq2;
seq_size = ARRAY_SIZE(hpload_seq2);
+ break;
+ default:
+ WARN(1, "Invalid dev_id for meas: %d", cs43130->dev_id);
+ return;
}
i = 0;
@@ -2147,7 +2151,7 @@ static irqreturn_t cs43130_irq_thread(int irq, void *data)
struct cs43130_private *cs43130 = (struct cs43130_private *)data;
struct snd_soc_codec *codec = cs43130->codec;
unsigned int stickies[CS43130_NUM_INT];
- unsigned int irq_occurrance = 0;
+ unsigned int irq_occurrence = 0;
unsigned int masks[CS43130_NUM_INT];
int i, j;
@@ -2161,12 +2165,12 @@ static irqreturn_t cs43130_irq_thread(int irq, void *data)
for (i = 0; i < ARRAY_SIZE(stickies); i++) {
stickies[i] = stickies[i] & (~masks[i]);
for (j = 0; j < 8; j++)
- irq_occurrance += (stickies[i] >> j) & 1;
+ irq_occurrence += (stickies[i] >> j) & 1;
}
dev_dbg(codec->dev, "number of interrupts occurred (%u)\n",
- irq_occurrance);
+ irq_occurrence);
- if (!irq_occurrance)
+ if (!irq_occurrence)
return IRQ_NONE;
if (stickies[0] & CS43130_XTAL_RDY_INT) {
@@ -2593,7 +2597,7 @@ static int cs43130_i2c_remove(struct i2c_client *client)
return 0;
}
-static int cs43130_runtime_suspend(struct device *dev)
+static int __maybe_unused cs43130_runtime_suspend(struct device *dev)
{
struct cs43130_private *cs43130 = dev_get_drvdata(dev);
@@ -2612,7 +2616,7 @@ static int cs43130_runtime_suspend(struct device *dev)
return 0;
}
-static int cs43130_runtime_resume(struct device *dev)
+static int __maybe_unused cs43130_runtime_resume(struct device *dev)
{
struct cs43130_private *cs43130 = dev_get_drvdata(dev);
int ret;