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.

+10 -6
+10 -6
sound/soc/codecs/cs43130.c
··· 2079 case CS43131_CHIP_ID: 2080 hpload_seq = hpload_seq2; 2081 seq_size = ARRAY_SIZE(hpload_seq2); 2082 } 2083 2084 i = 0; ··· 2151 struct cs43130_private *cs43130 = (struct cs43130_private *)data; 2152 struct snd_soc_codec *codec = cs43130->codec; 2153 unsigned int stickies[CS43130_NUM_INT]; 2154 - unsigned int irq_occurrance = 0; 2155 unsigned int masks[CS43130_NUM_INT]; 2156 int i, j; 2157 ··· 2165 for (i = 0; i < ARRAY_SIZE(stickies); i++) { 2166 stickies[i] = stickies[i] & (~masks[i]); 2167 for (j = 0; j < 8; j++) 2168 - irq_occurrance += (stickies[i] >> j) & 1; 2169 } 2170 dev_dbg(codec->dev, "number of interrupts occurred (%u)\n", 2171 - irq_occurrance); 2172 2173 - if (!irq_occurrance) 2174 return IRQ_NONE; 2175 2176 if (stickies[0] & CS43130_XTAL_RDY_INT) { ··· 2597 return 0; 2598 } 2599 2600 - static int cs43130_runtime_suspend(struct device *dev) 2601 { 2602 struct cs43130_private *cs43130 = dev_get_drvdata(dev); 2603 ··· 2616 return 0; 2617 } 2618 2619 - static int cs43130_runtime_resume(struct device *dev) 2620 { 2621 struct cs43130_private *cs43130 = dev_get_drvdata(dev); 2622 int ret;
··· 2079 case CS43131_CHIP_ID: 2080 hpload_seq = hpload_seq2; 2081 seq_size = ARRAY_SIZE(hpload_seq2); 2082 + break; 2083 + default: 2084 + WARN(1, "Invalid dev_id for meas: %d", cs43130->dev_id); 2085 + return; 2086 } 2087 2088 i = 0; ··· 2147 struct cs43130_private *cs43130 = (struct cs43130_private *)data; 2148 struct snd_soc_codec *codec = cs43130->codec; 2149 unsigned int stickies[CS43130_NUM_INT]; 2150 + unsigned int irq_occurrence = 0; 2151 unsigned int masks[CS43130_NUM_INT]; 2152 int i, j; 2153 ··· 2161 for (i = 0; i < ARRAY_SIZE(stickies); i++) { 2162 stickies[i] = stickies[i] & (~masks[i]); 2163 for (j = 0; j < 8; j++) 2164 + irq_occurrence += (stickies[i] >> j) & 1; 2165 } 2166 dev_dbg(codec->dev, "number of interrupts occurred (%u)\n", 2167 + irq_occurrence); 2168 2169 + if (!irq_occurrence) 2170 return IRQ_NONE; 2171 2172 if (stickies[0] & CS43130_XTAL_RDY_INT) { ··· 2593 return 0; 2594 } 2595 2596 + static int __maybe_unused cs43130_runtime_suspend(struct device *dev) 2597 { 2598 struct cs43130_private *cs43130 = dev_get_drvdata(dev); 2599 ··· 2612 return 0; 2613 } 2614 2615 + static int __maybe_unused cs43130_runtime_resume(struct device *dev) 2616 { 2617 struct cs43130_private *cs43130 = dev_get_drvdata(dev); 2618 int ret;