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

Commit 549acbe7 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c 



We have two functions to wait for a dispc interrupt:

int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout);
int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,

Of these, the former is not used at all, and can be removed. The latter
is only used by the compat layer, and can be moved to the compat layer
code.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent bb398134

drivers/video/omap2/dss/dispc-compat.c

+30 −0
Original line number Diff line number Diff line
@@ -205,3 +205,33 @@ void dispc_mgr_disable_sync(enum omap_channel channel) 
		WARN_ON(1);

}



int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,

		unsigned long timeout)

{

	void dispc_irq_wait_handler(void *data, u32 mask)

	{

		complete((struct completion *)data);

	}



	int r;

	DECLARE_COMPLETION_ONSTACK(completion);



	r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion,

			irqmask);



	if (r)

		return r;



	timeout = wait_for_completion_interruptible_timeout(&completion,

			timeout);



	omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask);



	if (timeout == 0)

		return -ETIMEDOUT;



	if (timeout == -ERESTARTSYS)

		return -ERESTARTSYS;



	return 0;

}

drivers/video/omap2/dss/dispc-compat.h

+3 −0
Original line number Diff line number Diff line
@@ -21,4 +21,7 @@ 
void dispc_mgr_enable_sync(enum omap_channel channel);

void dispc_mgr_disable_sync(enum omap_channel channel);



int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,

		unsigned long timeout);



#endif

drivers/video/omap2/dss/dispc.c

+0 −57
Original line number Diff line number Diff line
@@ -3750,63 +3750,6 @@ static void dispc_error_worker(struct work_struct *work) 
	dispc_runtime_put();

}



int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout)

{

	void dispc_irq_wait_handler(void *data, u32 mask)

	{

		complete((struct completion *)data);

	}



	int r;

	DECLARE_COMPLETION_ONSTACK(completion);



	r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion,

			irqmask);



	if (r)

		return r;



	timeout = wait_for_completion_timeout(&completion, timeout);



	omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask);



	if (timeout == 0)

		return -ETIMEDOUT;



	return 0;

}



int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,

		unsigned long timeout)

{

	void dispc_irq_wait_handler(void *data, u32 mask)

	{

		complete((struct completion *)data);

	}



	int r;

	DECLARE_COMPLETION_ONSTACK(completion);



	r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion,

			irqmask);



	if (r)

		return r;



	timeout = wait_for_completion_interruptible_timeout(&completion,

			timeout);



	omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask);



	if (timeout == 0)

		return -ETIMEDOUT;



	if (timeout == -ERESTARTSYS)

		return -ERESTARTSYS;



	return 0;

}



static void _omap_dispc_initialize_irq(void)

{

	unsigned long flags;

include/video/omapdss.h

+0 −4
Original line number Diff line number Diff line
@@ -775,10 +775,6 @@ typedef void (*omap_dispc_isr_t) (void *arg, u32 mask); 
int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);

int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask);



int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout);

int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,

		unsigned long timeout);



#define to_dss_driver(x) container_of((x), struct omap_dss_driver, driver)

#define to_dss_device(x) container_of((x), struct omap_dss_device, dev)