summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/omap
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-11-10 16:34:52 +0100
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2017-11-10 16:34:52 +0100
commit6c78935777d12ead2d32adf3eb525a24faf02d04 (patch)
treebab2ebe155d92ca535af6c2ff10287667beb8355 /drivers/video/fbdev/omap
parente4a67df75a7b93b1bcddf576fa9122da2305dc8b (diff)
downloadtalos-obmc-linux-6c78935777d12ead2d32adf3eb525a24faf02d04.tar.gz
talos-obmc-linux-6c78935777d12ead2d32adf3eb525a24faf02d04.zip
video: fbdev: 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. One tracking pointer was added. Signed-off-by: Kees Cook <keescook@chromium.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: David Lechner <david@lechnology.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Sean Paul <seanpaul@chromium.org> Cc: Jean Delvare <jdelvare@suse.de> Cc: Hans de Goede <hdegoede@redhat.com> Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com> [b.zolnierkie: ported it over pxa3xx_gcu changes] Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'drivers/video/fbdev/omap')
-rw-r--r--drivers/video/fbdev/omap/hwa742.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/fbdev/omap/hwa742.c b/drivers/video/fbdev/omap/hwa742.c
index a4ee65b8f918..6199d4806193 100644
--- a/drivers/video/fbdev/omap/hwa742.c
+++ b/drivers/video/fbdev/omap/hwa742.c
@@ -474,7 +474,7 @@ static void auto_update_complete(void *data)
jiffies + HWA742_AUTO_UPDATE_TIME);
}
-static void hwa742_update_window_auto(unsigned long arg)
+static void hwa742_update_window_auto(struct timer_list *unused)
{
LIST_HEAD(req_list);
struct hwa742_request *last;
@@ -1002,9 +1002,7 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,
hwa742.auto_update_window.height = fbdev->panel->y_res;
hwa742.auto_update_window.format = 0;
- init_timer(&hwa742.auto_update_timer);
- hwa742.auto_update_timer.function = hwa742_update_window_auto;
- hwa742.auto_update_timer.data = 0;
+ timer_setup(&hwa742.auto_update_timer, hwa742_update_window_auto, 0);
hwa742.prev_color_mode = -1;
hwa742.prev_flags = 0;
OpenPOWER on IntegriCloud