From patchwork Wed Aug 11 13:19:30 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: 176842 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: Wed, 11 Aug 2010 14:19:50 +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 1OjBDi-0007Ph-46 for chris@printf.net; Wed, 11 Aug 2010 14:19:50 +0100 Received: by mail.laptop.org (Postfix) id 416BC248DA; Wed, 11 Aug 2010 09:19:32 -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 2618E248D9 for ; Wed, 11 Aug 2010 09:19:32 -0400 (EDT) X-ASG-Debug-ID: 1281532787-0b74137a0001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id D3VPYLXOqgbJLyHc for ; Wed, 11 Aug 2010 09:19:47 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752691Ab0HKNTq (ORCPT ); Wed, 11 Aug 2010 09:19:46 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:44704 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752690Ab0HKNTp (ORCPT ); Wed, 11 Aug 2010 09:19:45 -0400 Received: by mail-bw0-f46.google.com with SMTP id 3so95750bwz.19 for ; Wed, 11 Aug 2010 06:19:45 -0700 (PDT) Received: by 10.204.23.81 with SMTP id q17mr4896bkb.58.1281532784976; Wed, 11 Aug 2010 06:19:44 -0700 (PDT) Received: from localhost.localdomain (93-172-40-159.bb.netvision.net.il [93.172.40.159]) by mx.google.com with ESMTPS id x13sm73652bki.12.2010.08.11.06.19.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 11 Aug 2010 06:19:44 -0700 (PDT) From: Ohad Ben-Cohen To: , Cc: , Luciano Coelho , , Ido Yariv , San Mehat , Roger Quadros , Nicolas Pitre , Gao Yunpeng , Ohad Ben-Cohen X-ASG-Orig-Subj: [RFC/PATCH 6/6] wireless: wl1271_sdio: enable Runtime PM Subject: [RFC/PATCH 6/6] wireless: wl1271_sdio: enable Runtime PM Date: Wed, 11 Aug 2010 16:19:30 +0300 Message-Id: <1281532770-27545-7-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1281532770-27545-1-git-send-email-ohad@wizery.com> References: <1281532770-27545-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: 1281532787 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.37680 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 bfb18b6..2dede64 100644 --- a/drivers/net/wireless/wl12xx/wl1271_sdio.c +++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c @@ -33,6 +33,7 @@ #include #include #include +#include #include "wl1271.h" #include "wl12xx_80211.h" @@ -156,20 +157,23 @@ 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); 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; + return err; } static struct wl1271_if_operations sdio_ops = { @@ -318,10 +322,23 @@ static int __devinit wl1271_probe(struct sdio_func *func, sdio_set_drvdata(func, wl); + /* indicate to Runtime PM core that our device is active */ + ret = pm_runtime_set_active(&func->dev); + if (ret) + goto unreg_hw; + + /* enable Runtime PM. + * When probe will return, runtime pm will immediately release power + * for us since we call pm_runtime_get() only when the user brings up + * the WLAN interface */ + pm_runtime_enable(&func->dev); + wl1271_notice("initialized"); return 0; +unreg_hw: + wl1271_unregister_hw(wl); out_irq: free_irq(wl->irq, wl); put_data: @@ -346,11 +363,29 @@ static void __devexit wl1271_remove(struct sdio_func *func) wl1271_free_hw(wl); } +static int wl1271_sdio_runtime_suspend(struct device *dev) +{ + return 0; +} + +static int wl1271_sdio_runtime_resume(struct device *dev) +{ + return 0; +} + +static const struct dev_pm_ops wl1271_sdio_pm_ops = { + .runtime_suspend = wl1271_sdio_runtime_suspend, + .runtime_resume = wl1271_sdio_runtime_resume, +}; + static struct sdio_driver wl1271_sdio_driver = { .name = "wl1271_sdio", .id_table = wl1271_devices, .probe = wl1271_probe, .remove = __devexit_p(wl1271_remove), + .drv = { + .pm = &wl1271_sdio_pm_ops, + }, }; static int __init wl1271_init(void)