| From e4b43eae56dea01d88026bc9e915c4bfd1847fe6 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Tue, 8 Nov 2011 20:35:36 -0800 |
| Subject: fbdev: sh_mipi_dsi: sh_mipi has pdata instead of dev |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Acked-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> |
| (cherry picked from commit 7d9f88b4f427df6dab7ff92ea81f1ddb7e9c95e4) |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| drivers/video/sh_mipi_dsi.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/video/sh_mipi_dsi.c b/drivers/video/sh_mipi_dsi.c |
| index b8aea8c..7e46505 100644 |
| --- a/drivers/video/sh_mipi_dsi.c |
| +++ b/drivers/video/sh_mipi_dsi.c |
| @@ -53,7 +53,7 @@ struct sh_mipi { |
| void __iomem *base; |
| void __iomem *linkbase; |
| struct clk *dsit_clk; |
| - struct device *dev; |
| + struct platform_device *pdev; |
| |
| void *next_board_data; |
| void (*next_display_on)(void *board_data, struct fb_info *info); |
| @@ -129,7 +129,7 @@ static void mipi_display_on(void *arg, struct fb_info *info) |
| { |
| struct sh_mipi *mipi = arg; |
| |
| - pm_runtime_get_sync(mipi->dev); |
| + pm_runtime_get_sync(&mipi->pdev->dev); |
| sh_mipi_dsi_enable(mipi, true); |
| |
| if (mipi->next_display_on) |
| @@ -144,7 +144,7 @@ static void mipi_display_off(void *arg) |
| mipi->next_display_off(mipi->next_board_data); |
| |
| sh_mipi_dsi_enable(mipi, false); |
| - pm_runtime_put(mipi->dev); |
| + pm_runtime_put(&mipi->pdev->dev); |
| } |
| |
| static int __init sh_mipi_setup(struct sh_mipi *mipi, |
| @@ -469,7 +469,7 @@ static int __init sh_mipi_probe(struct platform_device *pdev) |
| goto emap2; |
| } |
| |
| - mipi->dev = &pdev->dev; |
| + mipi->pdev = pdev; |
| |
| mipi->dsit_clk = clk_get(&pdev->dev, "dsit_clk"); |
| if (IS_ERR(mipi->dsit_clk)) { |
| -- |
| 1.7.10 |
| |
