From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zhou Zhu Date: Tue, 14 Jan 2014 11:16:22 +0000 Subject: [PATCH v2 2/4] video: mmp: no need to get clk_name from mach_info Message-Id: <1389698184-28761-3-git-send-email-zzhu3@marvell.com> List-Id: References: <1389698184-28761-1-git-send-email-zzhu3@marvell.com> In-Reply-To: <1389698184-28761-1-git-send-email-zzhu3-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Tomi Valkeinen , Jean-Christophe Plagniol-Villard , Haojian Zhuang , Sascha Hauer , Jingoo Han , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Chao Xie , Guoqing Li , Zhou Zhu As the display controller has only one clock, no need to get clk_name from mach_info Signed-off-by: Zhou Zhu --- drivers/video/mmp/hw/mmp_ctrl.c | 4 ++-- include/video/mmp_disp.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/video/mmp/hw/mmp_ctrl.c b/drivers/video/mmp/hw/mmp_ctrl.c index 8621a9f..b65913e 100644 --- a/drivers/video/mmp/hw/mmp_ctrl.c +++ b/drivers/video/mmp/hw/mmp_ctrl.c @@ -521,9 +521,9 @@ static int mmphw_probe(struct platform_device *pdev) } /* get clock */ - ctrl->clk = devm_clk_get(ctrl->dev, mi->clk_name); + ctrl->clk = devm_clk_get(ctrl->dev, NULL); if (IS_ERR(ctrl->clk)) { - dev_err(ctrl->dev, "unable to get clk %s\n", mi->clk_name); + dev_err(ctrl->dev, "unable to get clk for %s\n", ctrl->name); ret = -ENOENT; goto failed; } diff --git a/include/video/mmp_disp.h b/include/video/mmp_disp.h index 9fd9398..05a3a60 100644 --- a/include/video/mmp_disp.h +++ b/include/video/mmp_disp.h @@ -344,7 +344,6 @@ struct mmp_mach_path_config { struct mmp_mach_plat_info { const char *name; - const char *clk_name; int path_num; struct mmp_mach_path_config *paths; }; -- 1.7.9.5