21 Sep
2015
21 Sep
'15
11:38 a.m.
On 09/18/2015 11:11 PM, Cormier, Jonathan wrote:
diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index 620ab9ea1ef0..91fdd96648bd 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -370,10 +370,20 @@ static int aic26_spi_remove(struct spi_device *spi) return 0; }
+#if defined(CONFIG_OF)
You don't need the #ifdef here
+static const struct of_device_id tlv320aic26_of_match[] = {
- { .compatible = "ti,tlv320aic26", },
- {},
+}; +#endif
static struct spi_driver aic26_spi = { .driver = { .name = "tlv320aic26-codec", .owner = THIS_MODULE, +#if defined(CONFIG_OF)
neither here.
.of_match_table = of_match_ptr(tlv320aic26_of_match),
+#endif }, .probe = aic26_spi_probe, .remove = aic26_spi_remove,
--
Péter