Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef674997 authored by Kees Cook's avatar Kees Cook Committed by Mauro Carvalho Chehab
Browse files

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: 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 309167b9

drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c

+4 −9
Original line number Original line Diff line number Diff line
@@ -1661,20 +1661,15 @@ void atomisp_css_flush(struct atomisp_device *isp) 
	dev_dbg(isp->dev, "atomisp css flush done\n");

	dev_dbg(isp->dev, "atomisp css flush done\n");

}

}





#ifndef ISP2401

void atomisp_wdt(struct timer_list *t)

void atomisp_wdt(unsigned long isp_addr)

#else

void atomisp_wdt(unsigned long pipe_addr)

#endif

{

{

#ifndef ISP2401

#ifndef ISP2401

	struct atomisp_device *isp = (struct atomisp_device *)isp_addr;

	struct atomisp_sub_device *asd = from_timer(asd, t, wdt);

#else

#else

	struct atomisp_video_pipe *pipe =

	struct atomisp_video_pipe *pipe = from_timer(pipe, t, wdt);

		(struct atomisp_video_pipe *)pipe_addr;

	struct atomisp_sub_device *asd = pipe->asd;

	struct atomisp_sub_device *asd = pipe->asd;

	struct atomisp_device *isp = asd->isp;

#endif

#endif

	struct atomisp_device *isp = asd->isp;





#ifdef ISP2401

#ifdef ISP2401

	atomic_inc(&pipe->wdt_count);

	atomic_inc(&pipe->wdt_count);

drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h

+1 −5
Original line number Original line Diff line number Diff line
@@ -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_init(struct atomisp_device *isp, struct pci_dev *dev);

void atomisp_msi_irq_uninit(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);

void atomisp_wdt_work(struct work_struct *work);

#ifndef ISP2401

void atomisp_wdt(struct timer_list *t);

void atomisp_wdt(unsigned long isp_addr);

#else

void atomisp_wdt(unsigned long pipe_addr);

#endif

void atomisp_setup_flash(struct atomisp_sub_device *asd);

void atomisp_setup_flash(struct atomisp_sub_device *asd);

irqreturn_t atomisp_isr(int irq, void *dev);

irqreturn_t atomisp_isr(int irq, void *dev);

irqreturn_t atomisp_isr_thread(int irq, void *isp_ptr);

irqreturn_t atomisp_isr_thread(int irq, void *isp_ptr);

drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4515,7 +4515,7 @@ int atomisp_css_isr_thread(struct atomisp_device *isp, 
			for (i = 0; i < isp->num_of_streams; i++)

			for (i = 0; i < isp->num_of_streams; i++)

				atomisp_wdt_stop(&isp->asd[i], 0);

				atomisp_wdt_stop(&isp->asd[i], 0);

#ifndef ISP2401

#ifndef ISP2401

			atomisp_wdt((unsigned long)isp);

			atomisp_wdt(&isp->asd[0].wdt);

#else

#else

			queue_work(isp->wdt_work_queue, &isp->wdt_work);

			queue_work(isp->wdt_work_queue, &isp->wdt_work);

#endif

#endif

drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c

+5 −10
Original line number Original line Diff line number Diff line
@@ -1150,17 +1150,12 @@ static int init_atomisp_wdts(struct atomisp_device *isp) 
		struct atomisp_sub_device *asd = &isp->asd[i];

		struct atomisp_sub_device *asd = &isp->asd[i];

		asd = &isp->asd[i];

		asd = &isp->asd[i];

#ifndef ISP2401

#ifndef ISP2401

		setup_timer(&asd->wdt, atomisp_wdt, (unsigned long)isp);

		timer_setup(&asd->wdt, atomisp_wdt, 0);

#else

#else

		setup_timer(&asd->video_out_capture.wdt,

		timer_setup(&asd->video_out_capture.wdt, atomisp_wdt, 0);

			atomisp_wdt, (unsigned long)&asd->video_out_capture);

		timer_setup(&asd->video_out_preview.wdt, atomisp_wdt, 0);

		setup_timer(&asd->video_out_preview.wdt,

		timer_setup(&asd->video_out_vf.wdt, atomisp_wdt, 0);

			atomisp_wdt, (unsigned long)&asd->video_out_preview);

		timer_setup(&asd->video_out_video_capture.wdt, atomisp_wdt, 0);

		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);

#endif

#endif

	}

	}

	return 0;

	return 0;