From patchwork Thu Aug 29 13:16:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 2851340 Return-Path: X-Original-To: patchwork-linux-omap@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 87E65BF546 for ; Thu, 29 Aug 2013 13:19:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3171201C8 for ; Thu, 29 Aug 2013 13:19:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37F98201C0 for ; Thu, 29 Aug 2013 13:19:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754828Ab3H2NSp (ORCPT ); Thu, 29 Aug 2013 09:18:45 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:49161 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754772Ab3H2NSl (ORCPT ); Thu, 29 Aug 2013 09:18:41 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r7TDIJDW015753; Thu, 29 Aug 2013 08:18:19 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r7TDIJd0030131; Thu, 29 Aug 2013 08:18:19 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Thu, 29 Aug 2013 08:18:19 -0500 Received: from sokoban.tieu.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id r7TDGkKW002988; Thu, 29 Aug 2013 08:18:17 -0500 From: Tero Kristo To: , , , , , CC: , Subject: [PATCHv6 39/45] ARM: OMAP2+: omap_device: no need to add a clock dev for aliases Date: Thu, 29 Aug 2013 16:16:31 +0300 Message-ID: <1377782197-10611-40-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1377782197-10611-1-git-send-email-t-kristo@ti.com> References: <1377782197-10611-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Nishanth Menon When we create aliases, we have an handy clk_add_alias which can be used instead of creating new nodes in the clock tree. Signed-off-by: Nishanth Menon Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/omap_device.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c index 070d17b..7c796e2 100644 --- a/arch/arm/mach-omap2/omap_device.c +++ b/arch/arm/mach-omap2/omap_device.c @@ -45,8 +45,8 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias, const char *clk_name) { + int ret; struct clk *r; - struct clk_lookup *l; struct device *dev = &od->pdev->dev; if (!clk_alias || !clk_name) @@ -61,19 +61,10 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias, return; } - r = clk_get(NULL, clk_name); - if (IS_ERR(r)) { - dev_err(dev, "clk_get for %s failed\n", clk_name); - return; - } - - l = clkdev_alloc(r, clk_alias, dev_name(dev)); - if (!l) { - dev_err(dev, "clkdev_alloc for %s failed\n", clk_alias); - return; - } - - clkdev_add(l); + ret = clk_add_alias(clk_alias, dev_name(dev), (char *)clk_name, dev); + if (ret) + dev_err(dev, "Failed to alias %s to %s: %d\n", clk_alias, + clk_name, ret); } /**