From 978ae25e313e51eb9f729cff8afee6e4fba5fd00 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Wed, 19 Sep 2018 17:09:50 +0800 Subject: [PATCH] ASoc: ep92: change setup_timer to timer_setup On kernel-4.19, setup_timer is changed to timer_setup. Update ep92 driver to fix compile error. Change-Id: I844241413c72c415819774921f267d84692ba177 Signed-off-by: Meng Wang --- asoc/codecs/ep92/ep92.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/asoc/codecs/ep92/ep92.c b/asoc/codecs/ep92/ep92.c index 52f5e6d0b9..d3c67a2614 100644 --- a/asoc/codecs/ep92/ep92.c +++ b/asoc/codecs/ep92/ep92.c @@ -733,9 +733,9 @@ static irqreturn_t ep92_irq(int irq, void *data) return IRQ_HANDLED; }; -void ep92_poll_status(unsigned long data) +void ep92_poll_status(struct timer_list *t) { - struct ep92_pdata *ep92 = (struct ep92_pdata *)data; + struct ep92_pdata *ep92 = from_timer(ep92, t, timer); u32 poll_msec; if ((ep92->gc.ctl & EP92_GC_POWER_MASK) == 0) @@ -1493,8 +1493,7 @@ static int ep92_i2c_probe(struct i2c_client *client, } /* poll status if IRQ is not configured */ if (ep92->irq == 0) { - setup_timer(&ep92->timer, ep92_poll_status, - (unsigned long)ep92); + timer_setup(&ep92->timer, ep92_poll_status, 0); mod_timer(&ep92->timer, jiffies + msecs_to_jiffies(EP92_POLL_INTERVAL_OFF_MSEC)); }