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 65A97446C9; Tue, 20 Feb 2024 21:38:21 +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=1708465101; cv=none; b=XTxrH5/yAHjJKQw8g57hDW36DuovYrnrnnnisNYjEFFXW9RrPKmU/avpdqxhtLcpCqI72g5iIMISzw4zhrCMyuEBcoWsyTT2O8y9udIDsFu+owR/fnwNzjsVBDUExBvdn8CEorKcMhH2sCjMHs5NoeFDxAQNN6pF+XBpkocX0n8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708465101; c=relaxed/simple; bh=P69w97O0XKbNX6naWG7FuKeEpYKuk3aqcOBqVO9gwYE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KOD0ScSqAnZrxaCbBwx9VEnnBYN9DgDtprbprcRWTSOakQS8YdnOlE7j3M27mAANsTIkItYJW98riSbnbkE5WjHwXrqzNl9qxx5hot4UcJh6Wtb6Y9wMYy1nj2v5evLRis7A9Cm3plwaV/rzSmSwddsSVPGnEkeKf5QZ1P8eBEI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=C/4fAdeh; 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="C/4fAdeh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1804C433C7; Tue, 20 Feb 2024 21:38:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708465101; bh=P69w97O0XKbNX6naWG7FuKeEpYKuk3aqcOBqVO9gwYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C/4fAdehDlGJ2G+JCiRjbNtsBY1jrNJke+4fFeA0pUZZ/IPW3fxM9Nhqii8jxgLkB DWnGD+KOLsQMk9xwVGoQEha0nGKRgEQ5H1fltqNgR858Lxgj2RgYG/pVIHDLRihNOg yLl8bNnH7vmBMw+sJGkG+YEpZV9niOg2RtFzXZKA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexander Stein , Ulf Hansson Subject: [PATCH 6.7 237/309] mmc: slot-gpio: Allow non-sleeping GPIO ro Date: Tue, 20 Feb 2024 21:56:36 +0100 Message-ID: <20240220205640.580438052@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220205633.096363225@linuxfoundation.org> References: <20240220205633.096363225@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 6.7-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 @@ -75,11 +75,15 @@ EXPORT_SYMBOL(mmc_gpio_set_cd_irq); 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);