Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / wm831x-auxadc.c

diff --git a/drivers/mfd/wm831x-auxadc.c b/drivers/mfd/wm831x-auxadc.c
index 87210954a066f9598cc40b0dd7b2acfb00017f34..6ee3018d8653f6d8b73b92d70d296d2ed01e8f62 100644 (file)
--- a/drivers/mfd/wm831x-auxadc.c
+++ b/drivers/mfd/wm831x-auxadc.c
@@ -280,11 +280,11 @@ void wm831x_auxadc_init(struct wm831x *wm831x)
        mutex_init(&wm831x->auxadc_lock);
        INIT_LIST_HEAD(&wm831x->auxadc_pending);
 
-       if (wm831x->irq && wm831x->irq_base) {
+       if (wm831x->irq) {
                wm831x->auxadc_read = wm831x_auxadc_read_irq;
 
-               ret = request_threaded_irq(wm831x->irq_base +
-                                          WM831X_IRQ_AUXADC_DATA,
+               ret = request_threaded_irq(wm831x_irq(wm831x,
+                                                     WM831X_IRQ_AUXADC_DATA),
                                           NULL, wm831x_auxadc_irq, 0,
                                           "auxadc", wm831x);
                if (ret < 0) {