media: staging: atomisp: 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.

Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Daeseok Youn <daeseok.youn@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: devel@driverdev.osuosl.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
index b0c647f4d250fa673d1adfcf9008e45449bcdc9b..f3cf4ecba6308cf8a57b28df9e16d5258bac863e 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
@@ -1661,20 +1661,15 @@ void atomisp_css_flush(struct atomisp_device *isp)
        dev_dbg(isp->dev, "atomisp css flush done\n");
 }
 
-#ifndef ISP2401
-void atomisp_wdt(unsigned long isp_addr)
-#else
-void atomisp_wdt(unsigned long pipe_addr)
-#endif
+void atomisp_wdt(struct timer_list *t)
 {
 #ifndef ISP2401
-       struct atomisp_device *isp = (struct atomisp_device *)isp_addr;
+       struct atomisp_sub_device *asd = from_timer(asd, t, wdt);
 #else
-       struct atomisp_video_pipe *pipe =
-               (struct atomisp_video_pipe *)pipe_addr;
+       struct atomisp_video_pipe *pipe = from_timer(pipe, t, wdt);
        struct atomisp_sub_device *asd = pipe->asd;
-       struct atomisp_device *isp = asd->isp;
 #endif
+       struct atomisp_device *isp = asd->isp;
 
 #ifdef ISP2401
        atomic_inc(&pipe->wdt_count);

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h
index 31ba4e613d13eada298dbb484605c1faffbdc67d..4bb83864da2e63062ba8c5c8bbca125e8fc9b0c2 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h
@@ -85,11 +85,7 @@ static inline void __iomem *atomisp_get_io_virt_addr(unsigned int address)
 void atomisp_msi_irq_init(struct atomisp_device *isp, struct pci_dev *dev);
 void atomisp_msi_irq_uninit(struct atomisp_device *isp, struct pci_dev *dev);
 void atomisp_wdt_work(struct work_struct *work);
-#ifndef ISP2401
-void atomisp_wdt(unsigned long isp_addr);
-#else
-void atomisp_wdt(unsigned long pipe_addr);
-#endif
+void atomisp_wdt(struct timer_list *t);
 void atomisp_setup_flash(struct atomisp_sub_device *asd);
 irqreturn_t atomisp_isr(int irq, void *dev);
 irqreturn_t atomisp_isr_thread(int irq, void *isp_ptr);

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
index 05897b74734940931361abf2a22ca50049e6695e..0b907474e024750ff76c7ab29dbeefd32a1bd082 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
@@ -4515,7 +4515,7 @@ int atomisp_css_isr_thread(struct atomisp_device *isp,
                        for (i = 0; i < isp->num_of_streams; i++)
                                atomisp_wdt_stop(&isp->asd[i], 0);
 #ifndef ISP2401
-                       atomisp_wdt((unsigned long)isp);
+                       atomisp_wdt(&isp->asd[0].wdt);
 #else
                        queue_work(isp->wdt_work_queue, &isp->wdt_work);
 #endif

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
index e85b3819bffa1ef02f17ff54213211b6af282033..20aff7faf44ab24f13a52af29ee2e712b1ee27fa 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
@@ -1150,17 +1150,12 @@ static int init_atomisp_wdts(struct atomisp_device *isp)
                struct atomisp_sub_device *asd = &isp->asd[i];
                asd = &isp->asd[i];
 #ifndef ISP2401
-               setup_timer(&asd->wdt, atomisp_wdt, (unsigned long)isp);
+               timer_setup(&asd->wdt, atomisp_wdt, 0);
 #else
-               setup_timer(&asd->video_out_capture.wdt,
-                       atomisp_wdt, (unsigned long)&asd->video_out_capture);
-               setup_timer(&asd->video_out_preview.wdt,
-                       atomisp_wdt, (unsigned long)&asd->video_out_preview);
-               setup_timer(&asd->video_out_vf.wdt,
-                       atomisp_wdt, (unsigned long)&asd->video_out_vf);
-               setup_timer(&asd->video_out_video_capture.wdt,
-                       atomisp_wdt,
-                       (unsigned long)&asd->video_out_video_capture);
+               timer_setup(&asd->video_out_capture.wdt, atomisp_wdt, 0);
+               timer_setup(&asd->video_out_preview.wdt, atomisp_wdt, 0);
+               timer_setup(&asd->video_out_vf.wdt, atomisp_wdt, 0);
+               timer_setup(&asd->video_out_video_capture.wdt, atomisp_wdt, 0);
 #endif
        }
        return 0;