The clock related info for DSS modules is not tied anymore to a panel's omap_dss_device struct. It's now passed via platform data. The function hdmi_compute_pll() do not need the omap_dss_device argument to retieve these clocks. They use the api dss_get_platform_clock_config() get the clocks. Remove the omap_dss_device argument from hdmi_compute_pll() Signed-off-by: Archit Taneja <archit@xxxxxx> --- drivers/video/omap2/dss/hdmi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 16b2386..6635b09 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -405,8 +405,7 @@ unsigned long hdmi_get_pixel_clock(void) return hdmi.ip_data.cfg.timings.pixel_clock * 1000; } -static void hdmi_compute_pll(struct omap_dss_device *dssdev, int phy, - struct hdmi_pll_info *pi) +static void hdmi_compute_pll(int phy, struct hdmi_pll_info *pi) { const struct omapdss_clock_config *clks; unsigned long clkin, refclk; @@ -491,7 +490,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) } phy = p->pixel_clock; - hdmi_compute_pll(dssdev, phy, &hdmi.ip_data.pll_data); + hdmi_compute_pll(phy, &hdmi.ip_data.pll_data); hdmi.ip_data.ops->video_disable(&hdmi.ip_data); -- 1.7.9.5 -- 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