Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / sound / soc / codecs / wm8900.c

diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 1378aab5ca7562b6feaead8f87aff0c884c3d6aa..b4f11724a63ffc771c1a1d83909e31ae5cccaab7 100644 (file)
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -1256,7 +1256,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8900 = {
        .resume =       wm8900_resume,
        .set_bias_level = wm8900_set_bias_level,
        .volatile_register = wm8900_volatile_register,
-       .reg_cache_size = sizeof(wm8900_reg_defaults),
+       .reg_cache_size = ARRAY_SIZE(wm8900_reg_defaults),
        .reg_word_size = sizeof(u16),
        .reg_cache_default = wm8900_reg_defaults,
 };
@@ -1291,7 +1291,6 @@ static int __devexit wm8900_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8900_spi_driver = {
        .driver = {
                .name   = "wm8900-codec",
-               .bus    = &spi_bus_type,
                .owner  = THIS_MODULE,
        },
        .probe          = wm8900_spi_probe,