Merge tag 'asoc-v4.14-cs43130' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...

ASoC: Fixes for the CS43130 driver

A couple of warning fixes for the newly added CS43130 driver.

diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c
index 220e301..643e37f 100644 (file)
--- 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;