aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-02 05:32:48 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-11 08:46:28 -0500
commit277b2881c3c0d97e214487fbd677b0590fb4acf3 (patch)
treecac851832ce19442896ac7cc55a8b8ea863ab8d5
parent42c9dee82129d965bc8ca02170150817317c0135 (diff)
OMAP: DSS2: Remove pdev argument from dpi_init
dpi_init() does not use the pdev argument for anything. Remove it. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/omap2/dss/core.c2
-rw-r--r--drivers/video/omap2/dss/dpi.c2
-rw-r--r--drivers/video/omap2/dss/dss.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 02db5f1269ee..acefe50209fc 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -191,7 +191,7 @@ static int omap_dss_probe(struct platform_device *pdev)
191 goto err_rfbi; 191 goto err_rfbi;
192 } 192 }
193 193
194 r = dpi_init(pdev); 194 r = dpi_init();
195 if (r) { 195 if (r) {
196 DSSERR("Failed to initialize dpi\n"); 196 DSSERR("Failed to initialize dpi\n");
197 goto err_dpi; 197 goto err_dpi;
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 08fed3080c0a..2d3ca4ca4a05 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -319,7 +319,7 @@ int dpi_init_display(struct omap_dss_device *dssdev)
319 return 0; 319 return 0;
320} 320}
321 321
322int dpi_init(struct platform_device *pdev) 322int dpi_init(void)
323{ 323{
324 return 0; 324 return 0;
325} 325}
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 069fcc72331c..85d4141689c1 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -309,11 +309,11 @@ static inline void dsi_wait_pll_hsdiv_dsi_active(void)
309 309
310/* DPI */ 310/* DPI */
311#ifdef CONFIG_OMAP2_DSS_DPI 311#ifdef CONFIG_OMAP2_DSS_DPI
312int dpi_init(struct platform_device *pdev); 312int dpi_init(void);
313void dpi_exit(void); 313void dpi_exit(void);
314int dpi_init_display(struct omap_dss_device *dssdev); 314int dpi_init_display(struct omap_dss_device *dssdev);
315#else 315#else
316static inline int dpi_init(struct platform_device *pdev) 316static inline int dpi_init(void)
317{ 317{
318 return 0; 318 return 0;
319} 319}