From patchwork Sat Mar 9 20:23:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2242511 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 6A3E1DF2F2 for ; Sat, 9 Mar 2013 20:30:04 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UEQLJ-00051W-RU; Sat, 09 Mar 2013 20:26:11 +0000 Received: from mail-we0-x231.google.com ([2a00:1450:400c:c03::231]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UEQJ7-0004Rw-QS for linux-arm-kernel@lists.infradead.org; Sat, 09 Mar 2013 20:24:00 +0000 Received: by mail-we0-f177.google.com with SMTP id d7so2237698wer.36 for ; Sat, 09 Mar 2013 12:23:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=dMBe5vApCeWcFwW8ZTR8K4aK/0QctckYaZX3jT3QO+E=; b=d/cYefrMaeIGYkiyeQtACt9V3J8zCcmSQ/ETcqmddEdS/pDSpdmE93i9IDA/NNF0gA HPZqx7rzrH8Rtbpncd1yLGB0AkQbrYhH/oWX0MXg6WViV7zMWlB/uyUSwCNtG3Ixm/3G phhmdG6razYTQOVEEFhZ4VcwYjOAu990dnbFC6uOHUmGdLeeML2vPlhC4OAg5Xj5kPMQ hv42rHcuz+fCg7qg1jNocXRbYoW8NPbZ7+0MnfFVkWPTx++Bbafz+WbPjqzsrGuFpP52 bUd8bhZXJaL/rWS4bMbSn5CNwVegvsXvTKALx13dtXHjtv7dlYX1oTfNDvf9ReLA8moy QMpg== X-Received: by 10.180.8.4 with SMTP id n4mr4890276wia.13.1362860632024; Sat, 09 Mar 2013 12:23:52 -0800 (PST) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPS id ed6sm6858911wib.9.2013.03.09.12.23.49 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 09 Mar 2013 12:23:51 -0800 (PST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 07/12] clocksource: samsung-time: Use clk_get_sys for getting clocks Date: Sat, 9 Mar 2013 21:23:16 +0100 Message-Id: <1362860601-18464-8-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1362860601-18464-1-git-send-email-tomasz.figa@gmail.com> References: <1362860601-18464-1-git-send-email-tomasz.figa@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130309_152354_081703_EB544BDB X-CRM114-Status: UNSURE ( 9.64 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomasz.figa[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: ghcstop@gmail.com, Mark Rutland , Kukjin Kim , linux@arm.linux.org.uk, =?UTF-8?q?Heiko=20St=C3=BCbner?= , kwangwoo.lee@gmail.com, broonie@opensource.wolfsonmicro.com, mcuelenaere@gmail.com, Tomasz Figa , christer@weinigel.se, kyungmin.park@samsung.com, linux-samsung-soc@vger.kernel.org, buserror@gmail.com, augulis.darius@gmail.com, jacmet@sunsite.dk, Sylwester Nawrocki , linux@simtec.co.uk, jekhor@gmail.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch removes the need to reference platform_device structs defined in platform code, by using clk_get_sys instead of clk_get for getting necessary clocks. Signed-off-by: Tomasz Figa --- drivers/clocksource/samsung-time.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/clocksource/samsung-time.c b/drivers/clocksource/samsung-time.c index f14e3fa..31ae97b 100644 --- a/drivers/clocksource/samsung-time.c +++ b/drivers/clocksource/samsung-time.c @@ -24,8 +24,6 @@ #include #include -#include - static void __iomem *timer_base; #define S3C_TIMERREG(x) (timer_base + (x)) @@ -266,9 +264,6 @@ static void samsung_timer_resume(void) void __init samsung_set_timer_source(enum samsung_timer_mode event, enum samsung_timer_mode source) { - s3c_device_timer[event].dev.bus = &platform_bus_type; - s3c_device_timer[source].dev.bus = &platform_bus_type; - timer_source.event_id = event; timer_source.source_id = source; } @@ -418,28 +413,24 @@ static void __init samsung_timer_resources(void) clk_enable(timerclk); sprintf(devname, "s3c24xx-pwm.%lu", event_id); - s3c_device_timer[event_id].id = event_id; - s3c_device_timer[event_id].dev.init_name = devname; - tin_event = clk_get(&s3c_device_timer[event_id].dev, "pwm-tin"); + tin_event = clk_get_sys(devname, "pwm-tin"); if (IS_ERR(tin_event)) panic("failed to get pwm-tin clock for event timer"); - tdiv_event = clk_get(&s3c_device_timer[event_id].dev, "pwm-tdiv"); + tdiv_event = clk_get_sys(devname, "pwm-tdiv"); if (IS_ERR(tdiv_event)) panic("failed to get pwm-tdiv clock for event timer"); clk_enable(tin_event); sprintf(devname, "s3c24xx-pwm.%lu", source_id); - s3c_device_timer[source_id].id = source_id; - s3c_device_timer[source_id].dev.init_name = devname; - tin_source = clk_get(&s3c_device_timer[source_id].dev, "pwm-tin"); + tin_source = clk_get_sys(devname, "pwm-tin"); if (IS_ERR(tin_source)) panic("failed to get pwm-tin clock for source timer"); - tdiv_source = clk_get(&s3c_device_timer[source_id].dev, "pwm-tdiv"); + tdiv_source = clk_get_sys(devname, "pwm-tdiv"); if (IS_ERR(tdiv_source)) panic("failed to get pwm-tdiv clock for source timer");