* [PATCH linux-next] gpio: shared: keep the atomic set_bit() in the gpio-brgl merge
[not found] <avtjEdUWiljJ5V7o@sirena.org.uk>
@ 2026-11-16 21:42 ` Sasha Levin
0 siblings, 0 replies; only message in thread
From: Sasha Levin @ 2026-11-16 21:42 UTC (permalink / raw)
To: Mark Brown
Cc: Bartosz Golaszewski, Bartosz Golaszewski, linux-gpio,
linux-kernel, linux-next
Commit 7d1d799d6251 ("gpio: shared: use atomic set_bit() for descriptor
flags") in the gpio-brgl-fixes tree turned the two __set_bit() calls on
the descriptor flags into set_bit(). The gpio-brgl tree moved one of them
into gpio_shared_setup_entry(), and the merge resolution went back to
__set_bit() for both.
Use set_bit() in both places.
Fixes: 3fbbe94ecdd0 ("Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git")
Link: https://lore.kernel.org/all/avtjEdUWiljJ5V7o@sirena.org.uk/
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
To be folded into the gpio-brgl merge, 3fbbe94ecdd0 in next-20261116.
drivers/gpio/gpiolib-shared.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpio/gpiolib-shared.c b/drivers/gpio/gpiolib-shared.c
index 1b76c7ce5b969..7f8b31ce4b9ec 100644
--- a/drivers/gpio/gpiolib-shared.c
+++ b/drivers/gpio/gpiolib-shared.c
@@ -588,7 +588,7 @@ static int gpio_shared_setup_entry(struct gpio_chip *gc,
desc = &gdev->descs[entry->offset];
- __set_bit(GPIOD_FLAG_SHARED, &desc->flags);
+ set_bit(GPIOD_FLAG_SHARED, &desc->flags);
/*
* Shared GPIOs are not requested via the normal path. Make
* them inaccessible to anyone even before we register the
@@ -643,7 +643,7 @@ int gpiochip_setup_shared(struct gpio_chip *gc)
* This is a shared GPIO proxy. Mark its
* descriptor as such and return here.
*/
- __set_bit(GPIOD_FLAG_SHARED_PROXY, &gdev->descs[0].flags);
+ set_bit(GPIOD_FLAG_SHARED_PROXY, &gdev->descs[0].flags);
return 0;
}
}
base-commit: 749a4de370409464cf8501ec5b2451df45c84eb4
--
2.53.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-11-16 21:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <avtjEdUWiljJ5V7o@sirena.org.uk>
2026-11-16 21:42 ` [PATCH linux-next] gpio: shared: keep the atomic set_bit() in the gpio-brgl merge Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox