Commit 4ea40278 authored by Kees Cook's avatar Kees Cook Committed by Dmitry Torokhov

Input: keyboard - 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 avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent a11bc476
...@@ -127,10 +127,9 @@ static inline void bfin_kpad_clear_irq(void) ...@@ -127,10 +127,9 @@ static inline void bfin_kpad_clear_irq(void)
bfin_write_KPAD_ROWCOL(0xFFFF); bfin_write_KPAD_ROWCOL(0xFFFF);
} }
static void bfin_kpad_timer(unsigned long data) static void bfin_kpad_timer(struct timer_list *t)
{ {
struct platform_device *pdev = (struct platform_device *) data; struct bf54x_kpad *bf54x_kpad = from_timer(bf54x_kpad, t, timer);
struct bf54x_kpad *bf54x_kpad = platform_get_drvdata(pdev);
if (bfin_kpad_get_keypressed(bf54x_kpad)) { if (bfin_kpad_get_keypressed(bf54x_kpad)) {
/* Try again later */ /* Try again later */
...@@ -298,7 +297,7 @@ static int bfin_kpad_probe(struct platform_device *pdev) ...@@ -298,7 +297,7 @@ static int bfin_kpad_probe(struct platform_device *pdev)
/* Init Keypad Key Up/Release test timer */ /* Init Keypad Key Up/Release test timer */
setup_timer(&bf54x_kpad->timer, bfin_kpad_timer, (unsigned long) pdev); timer_setup(&bf54x_kpad->timer, bfin_kpad_timer, 0);
bfin_write_KPAD_PRESCALE(bfin_kpad_get_prescale(TIME_SCALE)); bfin_write_KPAD_PRESCALE(bfin_kpad_get_prescale(TIME_SCALE));
......
...@@ -184,9 +184,9 @@ static void imx_keypad_fire_events(struct imx_keypad *keypad, ...@@ -184,9 +184,9 @@ static void imx_keypad_fire_events(struct imx_keypad *keypad,
/* /*
* imx_keypad_check_for_events is the timer handler. * imx_keypad_check_for_events is the timer handler.
*/ */
static void imx_keypad_check_for_events(unsigned long data) static void imx_keypad_check_for_events(struct timer_list *t)
{ {
struct imx_keypad *keypad = (struct imx_keypad *) data; struct imx_keypad *keypad = from_timer(keypad, t, check_matrix_timer);
unsigned short matrix_volatile_state[MAX_MATRIX_KEY_COLS]; unsigned short matrix_volatile_state[MAX_MATRIX_KEY_COLS];
unsigned short reg_val; unsigned short reg_val;
bool state_changed, is_zero_matrix; bool state_changed, is_zero_matrix;
...@@ -456,8 +456,8 @@ static int imx_keypad_probe(struct platform_device *pdev) ...@@ -456,8 +456,8 @@ static int imx_keypad_probe(struct platform_device *pdev)
keypad->irq = irq; keypad->irq = irq;
keypad->stable_count = 0; keypad->stable_count = 0;
setup_timer(&keypad->check_matrix_timer, timer_setup(&keypad->check_matrix_timer,
imx_keypad_check_for_events, (unsigned long) keypad); imx_keypad_check_for_events, 0);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
keypad->mmio_base = devm_ioremap_resource(&pdev->dev, res); keypad->mmio_base = devm_ioremap_resource(&pdev->dev, res);
......
...@@ -210,9 +210,9 @@ static irqreturn_t locomokbd_interrupt(int irq, void *dev_id) ...@@ -210,9 +210,9 @@ static irqreturn_t locomokbd_interrupt(int irq, void *dev_id)
/* /*
* LoCoMo timer checking for released keys * LoCoMo timer checking for released keys
*/ */
static void locomokbd_timer_callback(unsigned long data) static void locomokbd_timer_callback(struct timer_list *t)
{ {
struct locomokbd *locomokbd = (struct locomokbd *) data; struct locomokbd *locomokbd = from_timer(locomokbd, t, timer);
locomokbd_scankeyboard(locomokbd); locomokbd_scankeyboard(locomokbd);
} }
...@@ -264,8 +264,7 @@ static int locomokbd_probe(struct locomo_dev *dev) ...@@ -264,8 +264,7 @@ static int locomokbd_probe(struct locomo_dev *dev)
spin_lock_init(&locomokbd->lock); spin_lock_init(&locomokbd->lock);
setup_timer(&locomokbd->timer, locomokbd_timer_callback, timer_setup(&locomokbd->timer, locomokbd_timer_callback, 0);
(unsigned long)locomokbd);
locomokbd->suspend_jiffies = jiffies; locomokbd->suspend_jiffies = jiffies;
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#undef NEW_BOARD_LEARNING_MODE #undef NEW_BOARD_LEARNING_MODE
static void omap_kp_tasklet(unsigned long); static void omap_kp_tasklet(unsigned long);
static void omap_kp_timer(unsigned long); static void omap_kp_timer(struct timer_list *);
static unsigned char keypad_state[8]; static unsigned char keypad_state[8];
static DEFINE_MUTEX(kp_enable_mutex); static DEFINE_MUTEX(kp_enable_mutex);
...@@ -74,7 +74,7 @@ static irqreturn_t omap_kp_interrupt(int irq, void *dev_id) ...@@ -74,7 +74,7 @@ static irqreturn_t omap_kp_interrupt(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void omap_kp_timer(unsigned long data) static void omap_kp_timer(struct timer_list *unused)
{ {
tasklet_schedule(&kp_tasklet); tasklet_schedule(&kp_tasklet);
} }
...@@ -233,7 +233,7 @@ static int omap_kp_probe(struct platform_device *pdev) ...@@ -233,7 +233,7 @@ static int omap_kp_probe(struct platform_device *pdev)
col_idx = 0; col_idx = 0;
row_idx = 0; row_idx = 0;
setup_timer(&omap_kp->timer, omap_kp_timer, (unsigned long)omap_kp); timer_setup(&omap_kp->timer, omap_kp_timer, 0);
/* get the irq and init timer*/ /* get the irq and init timer*/
kp_tasklet.data = (unsigned long) omap_kp; kp_tasklet.data = (unsigned long) omap_kp;
......
...@@ -45,9 +45,9 @@ struct pwrkey_drv_data { ...@@ -45,9 +45,9 @@ struct pwrkey_drv_data {
struct input_dev *input; struct input_dev *input;
}; };
static void imx_imx_snvs_check_for_events(unsigned long data) static void imx_imx_snvs_check_for_events(struct timer_list *t)
{ {
struct pwrkey_drv_data *pdata = (struct pwrkey_drv_data *) data; struct pwrkey_drv_data *pdata = from_timer(pdata, t, check_timer);
struct input_dev *input = pdata->input; struct input_dev *input = pdata->input;
u32 state; u32 state;
...@@ -134,8 +134,7 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) ...@@ -134,8 +134,7 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)
/* clear the unexpected interrupt before driver ready */ /* clear the unexpected interrupt before driver ready */
regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO); regmap_write(pdata->snvs, SNVS_LPSR_REG, SNVS_LPSR_SPO);
setup_timer(&pdata->check_timer, timer_setup(&pdata->check_timer, imx_imx_snvs_check_for_events, 0);
imx_imx_snvs_check_for_events, (unsigned long) pdata);
input = devm_input_allocate_device(&pdev->dev); input = devm_input_allocate_device(&pdev->dev);
if (!input) { if (!input) {
......
...@@ -251,9 +251,9 @@ static void tegra_kbc_set_fifo_interrupt(struct tegra_kbc *kbc, bool enable) ...@@ -251,9 +251,9 @@ static void tegra_kbc_set_fifo_interrupt(struct tegra_kbc *kbc, bool enable)
writel(val, kbc->mmio + KBC_CONTROL_0); writel(val, kbc->mmio + KBC_CONTROL_0);
} }
static void tegra_kbc_keypress_timer(unsigned long data) static void tegra_kbc_keypress_timer(struct timer_list *t)
{ {
struct tegra_kbc *kbc = (struct tegra_kbc *)data; struct tegra_kbc *kbc = from_timer(kbc, t, timer);
unsigned long flags; unsigned long flags;
u32 val; u32 val;
unsigned int i; unsigned int i;
...@@ -655,7 +655,7 @@ static int tegra_kbc_probe(struct platform_device *pdev) ...@@ -655,7 +655,7 @@ static int tegra_kbc_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
setup_timer(&kbc->timer, tegra_kbc_keypress_timer, (unsigned long)kbc); timer_setup(&kbc->timer, tegra_kbc_keypress_timer, 0);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
kbc->mmio = devm_ioremap_resource(&pdev->dev, res); kbc->mmio = devm_ioremap_resource(&pdev->dev, res);
......
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