From ea64ecc1b2c55192ccb7d08d1842f05c789cf50d Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Wed, 4 Jul 2012 13:48:34 +0530 Subject: [PATCH] --- yaml --- r: 333585 b: refs/heads/master c: 400e65d1c9946c9bf4d87a94d71f7d7423d03b62 h: refs/heads/master i: 333583: 10335413c7eec57932fe4a5a0b6c23ec2404c929 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dsi.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index eb542a595408..3589be0488f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d512fcdf6dc27ea34734fbdcab812d207b89ebb +refs/heads/master: 400e65d1c9946c9bf4d87a94d71f7d7423d03b62 diff --git a/trunk/drivers/video/omap2/dss/dsi.c b/trunk/drivers/video/omap2/dss/dsi.c index 55748bc081e8..dbe7d3ec8436 100644 --- a/trunk/drivers/video/omap2/dss/dsi.c +++ b/trunk/drivers/video/omap2/dss/dsi.c @@ -345,8 +345,6 @@ struct dsi_packet_sent_handler_data { struct completion *completion; }; -static struct platform_device *dsi_pdev_map[MAX_NUM_DSI]; - #ifdef DEBUG static bool dsi_perf; module_param(dsi_perf, bool, 0644); @@ -359,12 +357,19 @@ static inline struct dsi_data *dsi_get_dsidrv_data(struct platform_device *dside static inline struct platform_device *dsi_get_dsidev_from_dssdev(struct omap_dss_device *dssdev) { - return dsi_pdev_map[dssdev->phy.dsi.module]; + return dssdev->output->pdev; } struct platform_device *dsi_get_dsidev_from_id(int module) { - return dsi_pdev_map[module]; + struct omap_dss_output *out; + enum omap_dss_output_id id; + + id = module == 0 ? OMAP_DSS_OUTPUT_DSI1 : OMAP_DSS_OUTPUT_DSI2; + + out = omap_dss_get_output(id); + + return out->pdev; } static inline void dsi_write_reg(struct platform_device *dsidev, @@ -5194,7 +5199,6 @@ static int __init omap_dsihw_probe(struct platform_device *dsidev) dsi->module_id = dsidev->id; dsi->pdev = dsidev; - dsi_pdev_map[dsi->module_id] = dsidev; dev_set_drvdata(&dsidev->dev, dsi); spin_lock_init(&dsi->irq_lock);