linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chen-Yu Tsai <wens@csie.org>
To: Linus Walleij <linus.walleij@linaro.org>,
	Johannes Berg <johannes@sipsolutions.net>,
	"John W. Linville" <linville@tuxdriver.com>,
	Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>, Arnd Bergmann <arnd@arndb.de>,
	Heikki Krogerus <heikki.krogerus@linux.intel.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	Alexandre Courbot <gnurou@gmail.com>,
	Stephen Warren <swarren@wwwdotorg.org>,
	linux-gpio@vger.kernel.org, linux-wireless@vger.kernel.org,
	netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-sunxi@googlegroups.com
Subject: [PATCH 3/7] net: rfkill: gpio: use clk_prepare_enable/clk_disable_unprepare
Date: Tue, 15 Apr 2014 14:41:37 +0800	[thread overview]
Message-ID: <1397544101-18135-4-git-send-email-wens@csie.org> (raw)
In-Reply-To: <1397544101-18135-1-git-send-email-wens@csie.org>

rfkill-gpio calls clk_enable() without first calling clk_prepare(),
resulting in a warning and no effect. Switch to clk_prepare_enable()
and clk_disable_unprepare.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 net/rfkill/rfkill-gpio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 9c4a5eb..29ff07c 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -49,10 +49,10 @@ static int rfkill_gpio_set_power(void *data, bool blocked)
 		gpiod_set_value(rfkill->shutdown_gpio, 0);
 		gpiod_set_value(rfkill->reset_gpio, 0);
 		if (!IS_ERR(rfkill->clk) && rfkill->clk_enabled)
-			clk_disable(rfkill->clk);
+			clk_disable_unprepare(rfkill->clk);
 	} else {
 		if (!IS_ERR(rfkill->clk) && !rfkill->clk_enabled)
-			clk_enable(rfkill->clk);
+			clk_prepare_enable(rfkill->clk);
 		gpiod_set_value(rfkill->reset_gpio, 1);
 		gpiod_set_value(rfkill->shutdown_gpio, 1);
 	}
-- 
1.9.1


  parent reply	other threads:[~2014-04-15  7:22 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-15  6:41 [PATCH 0/7] net: rfkill: gpio: Add device tree support Chen-Yu Tsai
2014-04-15  6:41 ` [PATCH 1/7] gpiolib: gpiolib-of: Implement device tree gpio-names based lookup Chen-Yu Tsai
2014-04-15 14:20   ` Maxime Ripard
2014-04-16  6:12     ` Alexandre Courbot
2014-04-16  7:06       ` Alexandre Courbot
2014-04-16  9:56         ` Chen-Yu Tsai
2014-04-22 15:02   ` Linus Walleij
2014-04-23  1:49     ` Alexandre Courbot
2014-04-28 16:19       ` [linux-sunxi] " Chen-Yu Tsai
2014-04-15  6:41 ` [PATCH 2/7] gpiolib: Support purely name based gpiod lookup in device trees Chen-Yu Tsai
2014-04-22 15:00   ` Linus Walleij
2014-04-22 15:18     ` Maxime Ripard
2014-04-23 13:55       ` Linus Walleij
2014-04-15  6:41 ` Chen-Yu Tsai [this message]
2014-04-15 14:26   ` [PATCH 3/7] net: rfkill: gpio: use clk_prepare_enable/clk_disable_unprepare Maxime Ripard
2014-04-15  6:41 ` [PATCH 4/7] net: rfkill: gpio: fix reversed clock enable state Chen-Yu Tsai
2014-04-15 14:27   ` Maxime Ripard
2014-04-15  6:41 ` [PATCH 5/7] net: rfkill: gpio: add device tree support Chen-Yu Tsai
2014-04-15 21:00   ` Stephen Warren
2014-04-15 21:01   ` Stephen Warren
2014-04-15  6:41 ` [PATCH 6/7] net: rfkill: gpio: add clock-frequency device tree property Chen-Yu Tsai
2014-04-15 14:44   ` Maxime Ripard
2014-04-15  6:41 ` [PATCH 7/7] ARM: sun7i: cubietruck: enable bluetooth module Chen-Yu Tsai
2014-04-15 14:42   ` Maxime Ripard
2014-04-15 16:06     ` [linux-sunxi] " Chen-Yu Tsai
2014-04-15 16:18       ` One Thousand Gnomes
2014-04-16  9:44       ` Maxime Ripard
2014-04-16 10:39         ` Chen-Yu Tsai
2014-04-18 17:47           ` maxime.ripard
     [not found]           ` <534E8102.4070404@redhat.com>
     [not found]             ` <534F862C.8010604@broadcom.com>
2014-04-18 17:49               ` maxime.ripard
2014-04-16 13:08         ` Hans de Goede
2014-04-22 15:06 ` [PATCH 0/7] net: rfkill: gpio: Add device tree support Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1397544101-18135-4-git-send-email-wens@csie.org \
    --to=wens@csie.org \
    --cc=arnd@arndb.de \
    --cc=devicetree@vger.kernel.org \
    --cc=gnurou@gmail.com \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=johannes@sipsolutions.net \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=maxime.ripard@free-electrons.com \
    --cc=mika.westerberg@linux.intel.com \
    --cc=netdev@vger.kernel.org \
    --cc=swarren@wwwdotorg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).