samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ASoc: ep92: change setup_timer to timer_setup"

Browse Source
This commit is contained in:
Linux Build Service Account
2018-12-07 13:20:52 -08:00
committed by Gerrit - the friendly Code Review server
parent 610822ab62 978ae25e31
commit 6463cdbf2f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
asoc/codecs/ep92/ep92.c
View File

@@ -725,9 +725,9 @@ static irqreturn_t ep92_irq(int irq, void *data)
return IRQ_HANDLED; 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; u32 poll_msec;
if ((ep92->gc.ctl & EP92_GC_POWER_MASK) == 0) if ((ep92->gc.ctl & EP92_GC_POWER_MASK) == 0)
@@ -1485,8 +1485,7 @@ static int ep92_i2c_probe(struct i2c_client *client,
} }
/* poll status if IRQ is not configured */ /* poll status if IRQ is not configured */
if (ep92->irq == 0) { if (ep92->irq == 0) {
setup_timer(&ep92->timer, ep92_poll_status, timer_setup(&ep92->timer, ep92_poll_status, 0);
(unsigned long)ep92);
mod_timer(&ep92->timer, jiffies + mod_timer(&ep92->timer, jiffies +
msecs_to_jiffies(EP92_POLL_INTERVAL_OFF_MSEC)); msecs_to_jiffies(EP92_POLL_INTERVAL_OFF_MSEC));
} }