From patchwork Sun Sep 2 16:37:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 1396751 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 65FEB3FD40 for ; Sun, 2 Sep 2012 16:40:11 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T8DAt-00060k-Fc; Sun, 02 Sep 2012 16:37:27 +0000 Received: from mail-wg0-f49.google.com ([74.125.82.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T8DAr-00060W-0M for linux-arm-kernel@lists.infradead.org; Sun, 02 Sep 2012 16:37:25 +0000 Received: by wgbdt14 with SMTP id dt14so2548359wgb.18 for ; Sun, 02 Sep 2012 09:37:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=UGaRBzBtEyJAcfA9NZgdn8Ju3p5dH9QWQ6fbeWCCBds=; b=B5rE42iO9oDwW3IOuNRRJc6hpOYyacovz680Ptj7fMptBxj/JwfR2MKxR4Wmpo8Vju TctXHQTpRQai2W3Pjs3XwsIpfZ8wywq/LvP3l7evFb5sVvNUUj9Qps+Nb53aoP1i5I1S f0d+SQJwzYkIWPdtN9OpUMXTg+PiKfPlb5ICh7b399YtkMOutvhpl6K8m5Hj0Y8UOzTu T9hZuGymyjGc5jHRaaX3M94rlA/yiwlMwaSkNXFDG+6zVGcim5UdA/G0Ice1F6/xRvMG xPmdzYyWlHZUU+xyUMbTFfu0a94DXY25W9UtBh1qWXhdFg3OtrdhAIctRnBum3qO6E2h +y5w== Received: by 10.216.196.94 with SMTP id q72mr7925831wen.149.1346603841244; Sun, 02 Sep 2012 09:37:21 -0700 (PDT) Received: from localhost.localdomain (031011252076.warszawa.vectranet.pl. [31.11.252.76]) by mx.google.com with ESMTPS id hv8sm14513064wib.0.2012.09.02.09.37.19 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 02 Sep 2012 09:37:20 -0700 (PDT) From: Sylwester Nawrocki To: kgene.kim@samsung.com Subject: [PATCH] ARM: Samsung: Remove unused code for the clocks debug-fs interface Date: Sun, 2 Sep 2012 18:37:03 +0200 Message-Id: <1346603823-14422-1-git-send-email-sylvester.nawrocki@gmail.com> X-Mailer: git-send-email 1.7.4.1 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (sylvester.nawrocki[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: amit.daniel@samsung.com, linux-samsung-soc@vger.kernel.org, thomas.abraham@linaro.org, Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Commit f86c6660927614fcda257 "ARM: SAMSUNG: Add clkdev infrastructure" disabled population of the 'clocks' list - the clocks are now on the clkdev clock list. However, this effectively broke the existing clocks debug-fs interface on all Samsung platforms. Nobody complained about this missing feature for over one year, so remove the unused code. This functionality will be restored when switching to the common clock framework. Signed-off-by: Sylwester Nawrocki --- arch/arm/plat-samsung/clock.c | 92 ---------------------------- arch/arm/plat-samsung/include/plat/clock.h | 8 +-- 2 files changed, 1 insertions(+), 99 deletions(-) -- 1.7.4.1 diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c index 65c5eca..a8a69af 100644 --- a/arch/arm/plat-samsung/clock.c +++ b/arch/arm/plat-samsung/clock.c @@ -39,25 +39,17 @@ #include #include #include -#if defined(CONFIG_DEBUG_FS) -#include -#endif #include #include #include - #include #include #include #include /* for s3c24xx_uart_devs */ -/* clock information */ - -static LIST_HEAD(clocks); - /* We originally used an mutex here, but some contexts (see resume) * are calling functions such as clk_set_parent() with IRQs disabled * causing an BUG to be triggered. @@ -381,87 +373,3 @@ int __init s3c24xx_register_baseclocks(unsigned long xtal) return 0; } - -#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) -/* debugfs support to trace clock tree hierarchy and attributes */ - -static struct dentry *clk_debugfs_root; - -static int clk_debugfs_register_one(struct clk *c) -{ - int err; - struct dentry *d; - struct clk *pa = c->parent; - char s[255]; - char *p = s; - - p += sprintf(p, "%s", c->devname); - - d = debugfs_create_dir(s, pa ? pa->dent : clk_debugfs_root); - if (!d) - return -ENOMEM; - - c->dent = d; - - d = debugfs_create_u8("usecount", S_IRUGO, c->dent, (u8 *)&c->usage); - if (!d) { - err = -ENOMEM; - goto err_out; - } - - d = debugfs_create_u32("rate", S_IRUGO, c->dent, (u32 *)&c->rate); - if (!d) { - err = -ENOMEM; - goto err_out; - } - return 0; - -err_out: - debugfs_remove_recursive(c->dent); - return err; -} - -static int clk_debugfs_register(struct clk *c) -{ - int err; - struct clk *pa = c->parent; - - if (pa && !pa->dent) { - err = clk_debugfs_register(pa); - if (err) - return err; - } - - if (!c->dent) { - err = clk_debugfs_register_one(c); - if (err) - return err; - } - return 0; -} - -static int __init clk_debugfs_init(void) -{ - struct clk *c; - struct dentry *d; - int err; - - d = debugfs_create_dir("clock", NULL); - if (!d) - return -ENOMEM; - clk_debugfs_root = d; - - list_for_each_entry(c, &clocks, list) { - err = clk_debugfs_register(c); - if (err) - goto err_out; - } - return 0; - -err_out: - debugfs_remove_recursive(clk_debugfs_root); - return err; -} -late_initcall(clk_debugfs_init); - -#endif /* defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) */ diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h index a62753d..16f3cd6 100644 --- a/arch/arm/plat-samsung/include/plat/clock.h +++ b/arch/arm/plat-samsung/include/plat/clock.h @@ -1,5 +1,4 @@ -/* linux/arch/arm/plat-s3c/include/plat/clock.h - * +/* * Copyright (c) 2004-2005 Simtec Electronics * http://www.simtec.co.uk/products/SWLINUX/ * Written by Ben Dooks, @@ -40,8 +39,6 @@ struct clk_ops { }; struct clk { - struct list_head list; - struct module *owner; struct clk *parent; const char *name; const char *devname; @@ -53,9 +50,6 @@ struct clk { struct clk_ops *ops; int (*enable)(struct clk *, int enable); struct clk_lookup lookup; -#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) - struct dentry *dent; /* For visible tree hierarchy */ -#endif }; /* other clocks which may be registered by board support */