From: Senthilvadivu Guruswamy <svadivu@xxxxxx>
Add platform_device argument to rfbi_init and dispc_init
to pass the pdev to the driver.
Signed-off-by: Senthilvadivu Guruswamy <svadivu@xxxxxx>
---
drivers/video/omap2/dss/core.c | 4 ++--
drivers/video/omap2/dss/dispc.c | 2 +-
drivers/video/omap2/dss/dss.h | 6 +++---
drivers/video/omap2/dss/rfbi.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index ce1f83b..f6fdf6a 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -286,7 +286,7 @@ static int omap_dispchw_probe(struct platform_device *pdev)
{
int r;
dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1 | DSS_CLK_54M);
- r = dispc_init();
+ r = dispc_init(pdev);
if (r) {
DSSERR("Failed to initialize dispc\n");
goto err_dispc;
@@ -331,7 +331,7 @@ static int omap_rfbihw_probe(struct platform_device *pdev)
{
int r;
dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1 | DSS_CLK_54M);
- r = rfbi_init();
+ r = rfbi_init(pdev);
if (r) {
DSSERR("Failed to initialize rfbi\n");
goto err_rfbi;
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index e777e35..ae18b5f 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -3091,7 +3091,7 @@ static void _omap_dispc_initial_config(void)
dispc_read_plane_fifo_sizes();
}
-int dispc_init(void)
+int dispc_init(struct platform_device *pdev)
{
u32 rev;
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 3f79292..7f9cdf5 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -311,7 +311,7 @@ static inline void dpi_exit(void)
#endif
/* DISPC */
-int dispc_init(void);
+int dispc_init(struct platform_device *pdev);
void dispc_exit(void);
void dispc_dump_clocks(struct seq_file *s);
void dispc_dump_irqs(struct seq_file *s);
@@ -413,7 +413,7 @@ static inline void venc_exit(void)
/* RFBI */
#ifdef CONFIG_OMAP2_DSS_RFBI
-int rfbi_init(void);
+int rfbi_init(struct platform_device *pdev);
void rfbi_exit(void);
void rfbi_dump_regs(struct seq_file *s);
@@ -425,7 +425,7 @@ void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t);
unsigned long rfbi_get_max_tx_rate(void);
int rfbi_init_display(struct omap_dss_device *display);
#else
-static inline int rfbi_init(void)
+static inline int rfbi_init(struct platform_device *pdev)
{
return 0;
}
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index cc23f53..fe4f423 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -957,7 +957,7 @@ void rfbi_dump_regs(struct seq_file *s)
#undef DUMPREG
}
-int rfbi_init(void)
+int rfbi_init(struct platform_device *pdev)
{
u32 rev;
u32 l;
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
