From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE833C3B187 for ; Tue, 11 Feb 2020 10:35:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8085220714 for ; Tue, 11 Feb 2020 10:35:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="fkEanw0C" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728436AbgBKKfN (ORCPT ); Tue, 11 Feb 2020 05:35:13 -0500 Received: from rere.qmqm.pl ([91.227.64.183]:26190 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728389AbgBKKfG (ORCPT ); Tue, 11 Feb 2020 05:35:06 -0500 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 48GzgC5kMmz20v; Tue, 11 Feb 2020 11:35:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1581417303; bh=raqJPwQCWLMgqidgr8190O09gGllM1uWjbFerVN4PWE=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=fkEanw0CAzq99Uei3PXZe2fn+lVKe252S8tSkylJ9mEZ6ELkT+IgKko4Uc3CVOEY7 mBBna3sZFrFripKqpUdmDO85DZOqBXAcLdutYhsoTS3ApG0mDefMzQQuXYNs/aO2FM swOnPrF4hAwVMKQt2NQrcxE7udhpn95NrylX1ehvyCVvDJVEnrcYXkMziszqzeHw2t B66dwWAZivXiHE8gzRMh+b2agZqShSwQivGRArtyABNmeSVmKJxjOFZH9537U8rXLl de7n60mTkyVDdBsVFjT+oYEDsu0J1sGWBFyy4AX0bTpZbjyGlf5Mt7WCZi1ounB+Io GRttimZWNKxnw== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.102.1 at mail Date: Tue, 11 Feb 2020 11:35:03 +0100 Message-Id: In-Reply-To: References: From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH v2 5/6] staging: wfx: use sleeping gpio accessors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: =?UTF-8?B?SsOpcsO0bWU=?= Pouiller , Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Driver calls GPIO get/set only from non-atomic context and so can use any GPIOs. Signed-off-by: Michał Mirosław --- drivers/staging/wfx/bh.c | 6 +++--- drivers/staging/wfx/bus_spi.c | 4 ++-- drivers/staging/wfx/main.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/wfx/bh.c b/drivers/staging/wfx/bh.c index 983c41d1fe7c..c6319ab7e71a 100644 --- a/drivers/staging/wfx/bh.c +++ b/drivers/staging/wfx/bh.c @@ -20,10 +20,10 @@ static void device_wakeup(struct wfx_dev *wdev) { if (!wdev->pdata.gpio_wakeup) return; - if (gpiod_get_value(wdev->pdata.gpio_wakeup)) + if (gpiod_get_value_cansleep(wdev->pdata.gpio_wakeup)) return; - gpiod_set_value(wdev->pdata.gpio_wakeup, 1); + gpiod_set_value_cansleep(wdev->pdata.gpio_wakeup, 1); if (wfx_api_older_than(wdev, 1, 4)) { if (!completion_done(&wdev->hif.ctrl_ready)) udelay(2000); @@ -45,7 +45,7 @@ static void device_release(struct wfx_dev *wdev) if (!wdev->pdata.gpio_wakeup) return; - gpiod_set_value(wdev->pdata.gpio_wakeup, 0); + gpiod_set_value_cansleep(wdev->pdata.gpio_wakeup, 0); } static int rx_helper(struct wfx_dev *wdev, size_t read_len, int *is_cnf) diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c index d6a75bd61595..e3cd12592662 100644 --- a/drivers/staging/wfx/bus_spi.c +++ b/drivers/staging/wfx/bus_spi.c @@ -210,9 +210,9 @@ static int wfx_spi_probe(struct spi_device *func) } else { if (spi_get_device_id(func)->driver_data & WFX_RESET_INVERTED) gpiod_toggle_active_low(bus->gpio_reset); - gpiod_set_value(bus->gpio_reset, 1); + gpiod_set_value_cansleep(bus->gpio_reset, 1); udelay(100); - gpiod_set_value(bus->gpio_reset, 0); + gpiod_set_value_cansleep(bus->gpio_reset, 0); udelay(2000); } diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c index 76b2ff7fc7fe..3c4c240229ad 100644 --- a/drivers/staging/wfx/main.c +++ b/drivers/staging/wfx/main.c @@ -425,7 +425,7 @@ int wfx_probe(struct wfx_dev *wdev) "enable 'quiescent' power mode with gpio %d and PDS file %s\n", desc_to_gpio(wdev->pdata.gpio_wakeup), wdev->pdata.file_pds); - gpiod_set_value(wdev->pdata.gpio_wakeup, 1); + gpiod_set_value_cansleep(wdev->pdata.gpio_wakeup, 1); control_reg_write(wdev, 0); hif_set_operational_mode(wdev, HIF_OP_POWER_MODE_QUIESCENT); } else { -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=DKIM_ADSP_ALL,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E16AC3B188 for ; Tue, 11 Feb 2020 10:35:15 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E878208C3 for ; Tue, 11 Feb 2020 10:35:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="fkEanw0C" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E878208C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=rere.qmqm.pl Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1AB92855CB; Tue, 11 Feb 2020 10:35:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qEepZuehruZB; Tue, 11 Feb 2020 10:35:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1A6E285617; Tue, 11 Feb 2020 10:35:14 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id BA4951BF982 for ; Tue, 11 Feb 2020 10:35:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B5AAE85585 for ; Tue, 11 Feb 2020 10:35:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G0rSFWaWigg0 for ; Tue, 11 Feb 2020 10:35:07 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 66F2183773 for ; Tue, 11 Feb 2020 10:35:07 +0000 (UTC) Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 48GzgC5kMmz20v; Tue, 11 Feb 2020 11:35:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1581417303; bh=raqJPwQCWLMgqidgr8190O09gGllM1uWjbFerVN4PWE=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=fkEanw0CAzq99Uei3PXZe2fn+lVKe252S8tSkylJ9mEZ6ELkT+IgKko4Uc3CVOEY7 mBBna3sZFrFripKqpUdmDO85DZOqBXAcLdutYhsoTS3ApG0mDefMzQQuXYNs/aO2FM swOnPrF4hAwVMKQt2NQrcxE7udhpn95NrylX1ehvyCVvDJVEnrcYXkMziszqzeHw2t B66dwWAZivXiHE8gzRMh+b2agZqShSwQivGRArtyABNmeSVmKJxjOFZH9537U8rXLl de7n60mTkyVDdBsVFjT+oYEDsu0J1sGWBFyy4AX0bTpZbjyGlf5Mt7WCZi1ounB+Io GRttimZWNKxnw== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.102.1 at mail Date: Tue, 11 Feb 2020 11:35:03 +0100 Message-Id: In-Reply-To: References: From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH v2 5/6] staging: wfx: use sleeping gpio accessors MIME-Version: 1.0 To: =?UTF-8?B?SsOpcsO0bWU=?= Pouiller , Greg Kroah-Hartman X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" RHJpdmVyIGNhbGxzIEdQSU8gZ2V0L3NldCBvbmx5IGZyb20gbm9uLWF0b21pYyBjb250ZXh0IGFu ZCBzbyBjYW4gdXNlIGFueQpHUElPcy4KClNpZ25lZC1vZmYtYnk6IE1pY2hhxYIgTWlyb3PFgmF3 IDxtaXJxLWxpbnV4QHJlcmUucW1xbS5wbD4KLS0tCiBkcml2ZXJzL3N0YWdpbmcvd2Z4L2JoLmMg ICAgICB8IDYgKysrLS0tCiBkcml2ZXJzL3N0YWdpbmcvd2Z4L2J1c19zcGkuYyB8IDQgKystLQog ZHJpdmVycy9zdGFnaW5nL3dmeC9tYWluLmMgICAgfCAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDYg aW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdp bmcvd2Z4L2JoLmMgYi9kcml2ZXJzL3N0YWdpbmcvd2Z4L2JoLmMKaW5kZXggOTgzYzQxZDFmZTdj Li5jNjMxOWFiN2U3MWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy93ZngvYmguYworKysg Yi9kcml2ZXJzL3N0YWdpbmcvd2Z4L2JoLmMKQEAgLTIwLDEwICsyMCwxMCBAQCBzdGF0aWMgdm9p ZCBkZXZpY2Vfd2FrZXVwKHN0cnVjdCB3ZnhfZGV2ICp3ZGV2KQogewogCWlmICghd2Rldi0+cGRh dGEuZ3Bpb193YWtldXApCiAJCXJldHVybjsKLQlpZiAoZ3Bpb2RfZ2V0X3ZhbHVlKHdkZXYtPnBk YXRhLmdwaW9fd2FrZXVwKSkKKwlpZiAoZ3Bpb2RfZ2V0X3ZhbHVlX2NhbnNsZWVwKHdkZXYtPnBk YXRhLmdwaW9fd2FrZXVwKSkKIAkJcmV0dXJuOwogCi0JZ3Bpb2Rfc2V0X3ZhbHVlKHdkZXYtPnBk YXRhLmdwaW9fd2FrZXVwLCAxKTsKKwlncGlvZF9zZXRfdmFsdWVfY2Fuc2xlZXAod2Rldi0+cGRh dGEuZ3Bpb193YWtldXAsIDEpOwogCWlmICh3ZnhfYXBpX29sZGVyX3RoYW4od2RldiwgMSwgNCkp IHsKIAkJaWYgKCFjb21wbGV0aW9uX2RvbmUoJndkZXYtPmhpZi5jdHJsX3JlYWR5KSkKIAkJCXVk ZWxheSgyMDAwKTsKQEAgLTQ1LDcgKzQ1LDcgQEAgc3RhdGljIHZvaWQgZGV2aWNlX3JlbGVhc2Uo c3RydWN0IHdmeF9kZXYgKndkZXYpCiAJaWYgKCF3ZGV2LT5wZGF0YS5ncGlvX3dha2V1cCkKIAkJ cmV0dXJuOwogCi0JZ3Bpb2Rfc2V0X3ZhbHVlKHdkZXYtPnBkYXRhLmdwaW9fd2FrZXVwLCAwKTsK KwlncGlvZF9zZXRfdmFsdWVfY2Fuc2xlZXAod2Rldi0+cGRhdGEuZ3Bpb193YWtldXAsIDApOwog fQogCiBzdGF0aWMgaW50IHJ4X2hlbHBlcihzdHJ1Y3Qgd2Z4X2RldiAqd2Rldiwgc2l6ZV90IHJl YWRfbGVuLCBpbnQgKmlzX2NuZikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy93ZngvYnVz X3NwaS5jIGIvZHJpdmVycy9zdGFnaW5nL3dmeC9idXNfc3BpLmMKaW5kZXggZDZhNzViZDYxNTk1 Li5lM2NkMTI1OTI2NjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy93ZngvYnVzX3NwaS5j CisrKyBiL2RyaXZlcnMvc3RhZ2luZy93ZngvYnVzX3NwaS5jCkBAIC0yMTAsOSArMjEwLDkgQEAg c3RhdGljIGludCB3Znhfc3BpX3Byb2JlKHN0cnVjdCBzcGlfZGV2aWNlICpmdW5jKQogCX0gZWxz ZSB7CiAJCWlmIChzcGlfZ2V0X2RldmljZV9pZChmdW5jKS0+ZHJpdmVyX2RhdGEgJiBXRlhfUkVT RVRfSU5WRVJURUQpCiAJCQlncGlvZF90b2dnbGVfYWN0aXZlX2xvdyhidXMtPmdwaW9fcmVzZXQp OwotCQlncGlvZF9zZXRfdmFsdWUoYnVzLT5ncGlvX3Jlc2V0LCAxKTsKKwkJZ3Bpb2Rfc2V0X3Zh bHVlX2NhbnNsZWVwKGJ1cy0+Z3Bpb19yZXNldCwgMSk7CiAJCXVkZWxheSgxMDApOwotCQlncGlv ZF9zZXRfdmFsdWUoYnVzLT5ncGlvX3Jlc2V0LCAwKTsKKwkJZ3Bpb2Rfc2V0X3ZhbHVlX2NhbnNs ZWVwKGJ1cy0+Z3Bpb19yZXNldCwgMCk7CiAJCXVkZWxheSgyMDAwKTsKIAl9CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvc3RhZ2luZy93ZngvbWFpbi5jIGIvZHJpdmVycy9zdGFnaW5nL3dmeC9tYWlu LmMKaW5kZXggNzZiMmZmN2ZjN2ZlLi4zYzRjMjQwMjI5YWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv c3RhZ2luZy93ZngvbWFpbi5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy93ZngvbWFpbi5jCkBAIC00 MjUsNyArNDI1LDcgQEAgaW50IHdmeF9wcm9iZShzdHJ1Y3Qgd2Z4X2RldiAqd2RldikKIAkJCSJl bmFibGUgJ3F1aWVzY2VudCcgcG93ZXIgbW9kZSB3aXRoIGdwaW8gJWQgYW5kIFBEUyBmaWxlICVz XG4iLAogCQkJZGVzY190b19ncGlvKHdkZXYtPnBkYXRhLmdwaW9fd2FrZXVwKSwKIAkJCXdkZXYt PnBkYXRhLmZpbGVfcGRzKTsKLQkJZ3Bpb2Rfc2V0X3ZhbHVlKHdkZXYtPnBkYXRhLmdwaW9fd2Fr ZXVwLCAxKTsKKwkJZ3Bpb2Rfc2V0X3ZhbHVlX2NhbnNsZWVwKHdkZXYtPnBkYXRhLmdwaW9fd2Fr ZXVwLCAxKTsKIAkJY29udHJvbF9yZWdfd3JpdGUod2RldiwgMCk7CiAJCWhpZl9zZXRfb3BlcmF0 aW9uYWxfbW9kZSh3ZGV2LCBISUZfT1BfUE9XRVJfTU9ERV9RVUlFU0NFTlQpOwogCX0gZWxzZSB7 Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRldmVsIG1haWxpbmcgbGlzdApkZXZlbEBsaW51eGRyaXZlcnByb2plY3Qub3JnCmh0dHA6 Ly9kcml2ZXJkZXYubGludXhkcml2ZXJwcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaXZl cmRldi1kZXZlbAo=