Merge remote-tracking branches 'asoc/fix/mtk', 'asoc/fix/psc', 'asoc/fix/pxa', 'asoc...

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

diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index 76b2f88d9d9b76014601616ea853aa882c3ffdce..581ec1502228ff7d3d367b2582ead6d3af619b21 100644 (file)
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -948,7 +948,7 @@ static int wm0010_spi_probe(struct spi_device *spi)
                trigger = IRQF_TRIGGER_FALLING;
        trigger |= IRQF_ONESHOT;
 
-       ret = request_threaded_irq(irq, NULL, wm0010_irq, trigger | IRQF_ONESHOT,
+       ret = request_threaded_irq(irq, NULL, wm0010_irq, trigger,
                                   "wm0010", wm0010);
        if (ret) {
                dev_err(wm0010->dev, "Failed to request IRQ %d: %d\n",
@@ -998,7 +998,6 @@ static int wm0010_spi_remove(struct spi_device *spi)
 static struct spi_driver wm0010_spi_driver = {
        .driver = {
                .name   = "wm0010",
-               .bus    = &spi_bus_type,
                .owner  = THIS_MODULE,
        },
        .probe          = wm0010_spi_probe,