From patchwork Tue Oct 2 22:24:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thomas.abraham@linaro.org X-Patchwork-Id: 11967 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8DAED23E57 for ; Tue, 2 Oct 2012 22:27:21 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3B6BDA189A4 for ; Tue, 2 Oct 2012 22:27:21 +0000 (UTC) Received: by ieje10 with SMTP id e10so15404334iej.11 for ; Tue, 02 Oct 2012 15:27:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=fI8awUQTRW/+c15pwF983AXPJqejZLFeDMR+a7CIcxc=; b=b1mrfBajV9dFOaRISc+zb+7hxyO7cCCXAaEk3ApPS2BWG2mt1eIvYPK5dJsKDZxLxX xJPlEYwkNmwisfeog5f1/zQDluMvbtN6hzuZAFkDhBrLzVAgFU/KMmNLBamPiCqGGB97 byulx7pqj3GmXMbMtlDYu4ZEdkc44Aby1baexKU0svF8boYwMV4BRzyROCt0K/TKNZsw mcRDx/YI1df2uS5yhgXqk5AJpXnkTtOMVeS5j7vVdaYAsdXk0yo2qGldneErrexJdi2x h9mY9VDgjjvpKmPPib3p9CnF8FVlLkU7D02NCyo1Tt024ZFnc68ZNz5QSJBhePHoE06I 4pbA== Received: by 10.50.184.129 with SMTP id eu1mr214704igc.0.1349216840670; Tue, 02 Oct 2012 15:27:20 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp109989igc; Tue, 2 Oct 2012 15:27:20 -0700 (PDT) Received: by 10.66.75.74 with SMTP id a10mr360276paw.46.1349216839301; Tue, 02 Oct 2012 15:27:19 -0700 (PDT) Received: from mail-da0-f50.google.com (mail-da0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id pj1si4350745pbc.25.2012.10.02.15.27.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 15:27:19 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) smtp.mail=thomas.abraham@linaro.org Received: by daez20 with SMTP id z20so2454908dae.37 for ; Tue, 02 Oct 2012 15:27:18 -0700 (PDT) Received: by 10.68.115.75 with SMTP id jm11mr7941934pbb.28.1349216838419; Tue, 02 Oct 2012 15:27:18 -0700 (PDT) Received: from localhost.localdomain ([121.168.7.175]) by mx.google.com with ESMTPS id od2sm1511165pbb.28.2012.10.02.15.27.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 15:27:17 -0700 (PDT) From: Thomas Abraham To: thomas.abraham@linaro.org Cc: patches@linaro.org Subject: [PATCH 01/15] watchdog: s3c2410_wdt: use clk_prepare_enable and clk_disable_unprepare Date: Wed, 3 Oct 2012 07:24:06 +0900 Message-Id: <1349216646-2383-1-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.7.5.4 X-Gm-Message-State: ALoCoQmfbHK15EWpeoakS8QzrGTvPtW5YkhE4TSZu0xvam0qCzLOV2mJETPUEfjtT+BwN1QxM770 Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare calls as required by common clock framework. Signed-off-by: Thomas Abraham --- drivers/watchdog/s3c2410_wdt.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 9245b4d..3cdaaff 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -354,7 +354,7 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev) goto err_map; } - clk_enable(wdt_clock); + clk_prepare_enable(wdt_clock); ret = s3c2410wdt_cpufreq_register(); if (ret < 0) { @@ -421,7 +421,7 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev) s3c2410wdt_cpufreq_deregister(); err_clk: - clk_disable(wdt_clock); + clk_disable_unprepare(wdt_clock); clk_put(wdt_clock); wdt_clock = NULL; @@ -445,7 +445,7 @@ static int __devexit s3c2410wdt_remove(struct platform_device *dev) s3c2410wdt_cpufreq_deregister(); - clk_disable(wdt_clock); + clk_disable_unprepare(wdt_clock); clk_put(wdt_clock); wdt_clock = NULL;