From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 078DD1E4B2; Wed, 21 Feb 2024 14:12:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708524736; cv=none; b=Xm03mRZDKEeztWlu1ETlSFlZImTVDYdLzELXKJvvMtkBz1fuzl3LO5sykrFjyXrRunFuf5BwY04qHduT5gVGZniki0UrPOvO9jSeGdG+ZVU2/XCSFAf8gxOtVyJ9zfRkvOHmIOl5yLRg+DrvZF9FA8DGPLrOiWJCGP5zv3d1044= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708524736; c=relaxed/simple; bh=JS/AYKQzinsUiLb0Z3g07qAvp7pEpOhD57Z1n8CoktA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I1C2oiowvhVjCTFoC6POjxhxKRdqg2vxUZPGf2GkZG7be71hf+YqFao5fqG9vfAuLK0ykRsAYFesaZXWajcn7MBe83dy3ZLu0RzJoq7YMtesoQ7Q6+MlseGPkiL3A7F6cb2G45mQkRGNOYsKF5V+v6vtUR+hwcJiXcslM8tcFG4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BSNjZse7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BSNjZse7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B9F0C433C7; Wed, 21 Feb 2024 14:12:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708524735; bh=JS/AYKQzinsUiLb0Z3g07qAvp7pEpOhD57Z1n8CoktA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BSNjZse7uzWqLyWHOsDCrVdMY4Ugq7YIh894rYwpaty7hr6D/UVZOYXbMhguAsLKt wAPj66SXJ9+OXBUY6eYhcYb/wJJ5EnUQZVJFwOCHEiAfPsYkSb7VXLMkR/VSh1WkuU yzRsno7nNhKuoy2yPdVIwa201MgTiIkFfwDhBbRg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexander Stein , Ulf Hansson Subject: [PATCH 5.10 333/379] mmc: slot-gpio: Allow non-sleeping GPIO ro Date: Wed, 21 Feb 2024 14:08:32 +0100 Message-ID: <20240221130004.826886859@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221125954.917878865@linuxfoundation.org> References: <20240221125954.917878865@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexander Stein commit cc9432c4fb159a3913e0ce3173b8218cd5bad2e0 upstream. This change uses the appropriate _cansleep or non-sleeping API for reading GPIO read-only state. This allows users with GPIOs that never sleepbeing called in atomic context. Implement the same mechanism as in commit 52af318c93e97 ("mmc: Allow non-sleeping GPIO cd"). Signed-off-by: Alexander Stein Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20240206083912.2543142-1-alexander.stein@ew.tq-group.com Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/core/slot-gpio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/drivers/mmc/core/slot-gpio.c +++ b/drivers/mmc/core/slot-gpio.c @@ -62,11 +62,15 @@ int mmc_gpio_alloc(struct mmc_host *host int mmc_gpio_get_ro(struct mmc_host *host) { struct mmc_gpio *ctx = host->slot.handler_priv; + int cansleep; if (!ctx || !ctx->ro_gpio) return -ENOSYS; - return gpiod_get_value_cansleep(ctx->ro_gpio); + cansleep = gpiod_cansleep(ctx->ro_gpio); + return cansleep ? + gpiod_get_value_cansleep(ctx->ro_gpio) : + gpiod_get_value(ctx->ro_gpio); } EXPORT_SYMBOL(mmc_gpio_get_ro);