From patchwork Tue Jan 14 11:16:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Zhu X-Patchwork-Id: 3485321 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 414C4C02DC for ; Tue, 14 Jan 2014 11:17:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E7DE8201E9 for ; Tue, 14 Jan 2014 11:17:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99A90201F9 for ; Tue, 14 Jan 2014 11:17:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751468AbaANLRW (ORCPT ); Tue, 14 Jan 2014 06:17:22 -0500 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:53079 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751351AbaANLRV (ORCPT ); Tue, 14 Jan 2014 06:17:21 -0500 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.14.5/8.14.5) with SMTP id s0EBGCB1022518; Tue, 14 Jan 2014 03:16:12 -0800 Received: from sc-owa.marvell.com ([199.233.58.135]) by mx0b-0016f401.pphosted.com with ESMTP id 1hcwywgvjg-14 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Tue, 14 Jan 2014 03:16:12 -0800 Received: from maili.marvell.com (10.93.76.43) by SC-OWA.marvell.com (10.93.76.28) with Microsoft SMTP Server id 8.3.327.1; Tue, 14 Jan 2014 03:16:08 -0800 Received: from localhost (unknown [10.38.36.157]) by maili.marvell.com (Postfix) with ESMTP id 1A90A1CCE3A; Tue, 14 Jan 2014 03:16:08 -0800 (PST) From: Zhou Zhu To: , Tomi Valkeinen , Jean-Christophe Plagniol-Villard , Haojian Zhuang , Sascha Hauer , Jingoo Han , CC: Chao Xie , Guoqing Li , Zhou Zhu Subject: [PATCH v2 2/4] video: mmp: no need to get clk_name from mach_info Date: Tue, 14 Jan 2014 19:16:22 +0800 Message-ID: <1389698184-28761-3-git-send-email-zzhu3@marvell.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389698184-28761-1-git-send-email-zzhu3@marvell.com> References: <1389698184-28761-1-git-send-email-zzhu3@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.11.87, 1.0.14, 0.0.0000 definitions=2014-01-14_03:2014-01-14, 2014-01-14, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1305240000 definitions=main-1401140026 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; };