From patchwork Tue Sep 7 11:29:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 178102 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Tue, 07 Sep 2010 12:30:01 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OswNF-0004S6-9t for chris@printf.net; Tue, 07 Sep 2010 12:30:01 +0100 Received: by mail.laptop.org (Postfix) id B0B402499B; Tue, 7 Sep 2010 07:29:41 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 9C3E624999 for ; Tue, 7 Sep 2010 07:29:41 -0400 (EDT) X-ASG-Debug-ID: 1283858999-0b74e4f80001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id QxbBtVOs6EB92Ai3 for ; Tue, 07 Sep 2010 07:29:59 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756541Ab0IGL35 (ORCPT ); Tue, 7 Sep 2010 07:29:57 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:33134 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755736Ab0IGL34 (ORCPT ); Tue, 7 Sep 2010 07:29:56 -0400 Received: by fxm13 with SMTP id 13so2890961fxm.19 for ; Tue, 07 Sep 2010 04:29:54 -0700 (PDT) Received: by 10.223.121.196 with SMTP id i4mr1015797far.11.1283858994067; Tue, 07 Sep 2010 04:29:54 -0700 (PDT) Received: from localhost.localdomain (46-116-15-195.bb.netvision.net.il [46.116.15.195]) by mx.google.com with ESMTPS id r8sm2764094faq.34.2010.09.07.04.29.51 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 07 Sep 2010 04:29:53 -0700 (PDT) From: Ohad Ben-Cohen To: , Cc: Luciano Coelho , , San Mehat , Roger Quadros , Nicolas Pitre , Gao Yunpeng , Ohad Ben-Cohen X-ASG-Orig-Subj: [PATCH v1 8/8] wireless: wl1271_sdio: enable Runtime PM Subject: [PATCH v1 8/8] wireless: wl1271_sdio: enable Runtime PM Date: Tue, 7 Sep 2010 14:29:09 +0300 Message-Id: <1283858949-11073-9-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1283858949-11073-1-git-send-email-ohad@wizery.com> References: <1283858949-11073-1-git-send-email-ohad@wizery.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1283858999 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.40182 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c index 824b9e8..235191e 100644 --- a/drivers/net/wireless/wl12xx/wl1271_sdio.c +++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "wl1271.h" #include "wl12xx_80211.h" @@ -153,20 +154,27 @@ static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf, static int wl1271_sdio_set_power(struct wl1271 *wl, bool enable) { struct sdio_func *func = wl_to_func(wl); + int err; /* Let the SDIO stack handle wlan_enable control, so we * keep host claimed while wlan is in use to keep wl1271 * alive. */ if (enable) { + err = pm_runtime_get_sync(&func->dev); + if (err) + goto out; + sdio_claim_host(func); sdio_enable_func(func); } else { sdio_disable_func(func); sdio_release_host(func); + err = pm_runtime_put_sync(&func->dev); } - return 0; +out: + return err; } static struct wl1271_if_operations sdio_ops = { @@ -233,6 +241,8 @@ static int __devinit wl1271_probe(struct sdio_func *func, sdio_set_drvdata(func, wl); + pm_runtime_put_noidle(&func->dev); + wl1271_notice("initialized"); return 0; @@ -255,6 +265,8 @@ static void __devexit wl1271_remove(struct sdio_func *func) wl1271_unregister_hw(wl); wl1271_free_hw(wl); + + pm_runtime_get_noresume(&func->dev); } static struct sdio_driver wl1271_sdio_driver = {