Commit fdbc1710 authored by Kees Cook's avatar Kees Cook Committed by Mauro Carvalho Chehab

media: staging: atomisp: i2c: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent b5027c52
...@@ -167,10 +167,9 @@ static int lm3554_set_config1(struct lm3554 *flash) ...@@ -167,10 +167,9 @@ static int lm3554_set_config1(struct lm3554 *flash)
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Hardware trigger * Hardware trigger
*/ */
static void lm3554_flash_off_delay(long unsigned int arg) static void lm3554_flash_off_delay(struct timer_list *t)
{ {
struct v4l2_subdev *sd = i2c_get_clientdata((struct i2c_client *)arg); struct lm3554 *flash = from_timer(flash, t, flash_off_delay);
struct lm3554 *flash = to_lm3554(sd);
struct lm3554_platform_data *pdata = flash->pdata; struct lm3554_platform_data *pdata = flash->pdata;
gpio_set_value(pdata->gpio_strobe, 0); gpio_set_value(pdata->gpio_strobe, 0);
...@@ -908,8 +907,7 @@ static int lm3554_probe(struct i2c_client *client) ...@@ -908,8 +907,7 @@ static int lm3554_probe(struct i2c_client *client)
mutex_init(&flash->power_lock); mutex_init(&flash->power_lock);
setup_timer(&flash->flash_off_delay, lm3554_flash_off_delay, timer_setup(&flash->flash_off_delay, lm3554_flash_off_delay, 0);
(unsigned long)client);
err = lm3554_gpio_init(client); err = lm3554_gpio_init(client);
if (err) { if (err) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment