* [PATCH] drivers/gpio/gpio-xtensa: fix driver build
@ 2019-11-26 19:30 Max Filippov
2019-11-27 7:29 ` Bartosz Golaszewski
0 siblings, 1 reply; 2+ messages in thread
From: Max Filippov @ 2019-11-26 19:30 UTC (permalink / raw)
To: linux-xtensa
Cc: Chris Zankel, linux-gpio, linux-kernel, Linus Walleij,
Bartosz Golaszewski, Baruch Siach, Max Filippov, stable
Commit cad6fade6e78 ("xtensa: clean up WSR*/RSR*/get_sr/set_sr") removed
{RSR,WSR}_CPENABLE from xtensa code, but did not fix up all users,
breaking gpio-xtensa driver build.
Update gpio-xtensa to use new xtensa_{get,set}_sr API.
Cc: stable@vger.kernel.org # v5.0+
Fixes: cad6fade6e78 ("xtensa: clean up WSR*/RSR*/get_sr/set_sr")
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
drivers/gpio/gpio-xtensa.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/gpio/gpio-xtensa.c b/drivers/gpio/gpio-xtensa.c
index 43d3fa5f511a..0fb2211f9573 100644
--- a/drivers/gpio/gpio-xtensa.c
+++ b/drivers/gpio/gpio-xtensa.c
@@ -44,15 +44,14 @@ static inline unsigned long enable_cp(unsigned long *cpenable)
unsigned long flags;
local_irq_save(flags);
- RSR_CPENABLE(*cpenable);
- WSR_CPENABLE(*cpenable | BIT(XCHAL_CP_ID_XTIOP));
-
+ *cpenable = xtensa_get_sr(cpenable);
+ xtensa_set_sr(*cpenable | BIT(XCHAL_CP_ID_XTIOP), cpenable);
return flags;
}
static inline void disable_cp(unsigned long flags, unsigned long cpenable)
{
- WSR_CPENABLE(cpenable);
+ xtensa_set_sr(cpenable, cpenable);
local_irq_restore(flags);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drivers/gpio/gpio-xtensa: fix driver build
2019-11-26 19:30 [PATCH] drivers/gpio/gpio-xtensa: fix driver build Max Filippov
@ 2019-11-27 7:29 ` Bartosz Golaszewski
0 siblings, 0 replies; 2+ messages in thread
From: Bartosz Golaszewski @ 2019-11-27 7:29 UTC (permalink / raw)
To: Max Filippov
Cc: linux-xtensa, Chris Zankel, linux-gpio, LKML, Linus Walleij,
Baruch Siach, Stable # 4 . 20+
wt., 26 lis 2019 o 20:30 Max Filippov <jcmvbkbc@gmail.com> napisał(a):
>
> Commit cad6fade6e78 ("xtensa: clean up WSR*/RSR*/get_sr/set_sr") removed
> {RSR,WSR}_CPENABLE from xtensa code, but did not fix up all users,
> breaking gpio-xtensa driver build.
> Update gpio-xtensa to use new xtensa_{get,set}_sr API.
>
> Cc: stable@vger.kernel.org # v5.0+
> Fixes: cad6fade6e78 ("xtensa: clean up WSR*/RSR*/get_sr/set_sr")
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> ---
> drivers/gpio/gpio-xtensa.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpio/gpio-xtensa.c b/drivers/gpio/gpio-xtensa.c
> index 43d3fa5f511a..0fb2211f9573 100644
> --- a/drivers/gpio/gpio-xtensa.c
> +++ b/drivers/gpio/gpio-xtensa.c
> @@ -44,15 +44,14 @@ static inline unsigned long enable_cp(unsigned long *cpenable)
> unsigned long flags;
>
> local_irq_save(flags);
> - RSR_CPENABLE(*cpenable);
> - WSR_CPENABLE(*cpenable | BIT(XCHAL_CP_ID_XTIOP));
> -
> + *cpenable = xtensa_get_sr(cpenable);
> + xtensa_set_sr(*cpenable | BIT(XCHAL_CP_ID_XTIOP), cpenable);
> return flags;
> }
>
> static inline void disable_cp(unsigned long flags, unsigned long cpenable)
> {
> - WSR_CPENABLE(cpenable);
> + xtensa_set_sr(cpenable, cpenable);
> local_irq_restore(flags);
> }
>
> --
> 2.20.1
>
Patch applied, thanks!
Bart
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-27 7:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-26 19:30 [PATCH] drivers/gpio/gpio-xtensa: fix driver build Max Filippov
2019-11-27 7:29 ` Bartosz Golaszewski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).