| Message ID | 35f0f17e3d987afaa9cd09cdcb8131d42a53c3e1.1637593297.git.geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9d348f6b92801eca5671e75e1d10b7d34738681a |
| Headers | show |
| Series | MIPS: CPC: Use bitfield helpers | expand |
On Mon, Nov 22, 2021 at 04:53:46PM +0100, Geert Uytterhoeven wrote: > Use the FIELD_PREP() helper, instead of open-coding the same operation. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > Compile-tested only. > > See "[PATCH 00/17] Non-const bitfield helper conversions" > (https://lore.kernel.org/r/cover.1637592133.git.geert+renesas@glider.be) > for background and more conversions. > --- > arch/mips/kernel/mips-cpc.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/mips/kernel/mips-cpc.c b/arch/mips/kernel/mips-cpc.c > index 8d2535123f11c8f3..17aff13cd7ce6ea7 100644 > --- a/arch/mips/kernel/mips-cpc.c > +++ b/arch/mips/kernel/mips-cpc.c > @@ -4,6 +4,7 @@ > * Author: Paul Burton <paul.burton@mips.com> > */ > > +#include <linux/bitfield.h> > #include <linux/errno.h> > #include <linux/percpu.h> > #include <linux/of.h> > @@ -97,7 +98,7 @@ void mips_cpc_lock_other(unsigned int core) > curr_core = cpu_core(¤t_cpu_data); > spin_lock_irqsave(&per_cpu(cpc_core_lock, curr_core), > per_cpu(cpc_core_lock_flags, curr_core)); > - write_cpc_cl_other(core << __ffs(CPC_Cx_OTHER_CORENUM)); > + write_cpc_cl_other(FIELD_PREP(CPC_Cx_OTHER_CORENUM, core)); > > /* > * Ensure the core-other region reflects the appropriate core & > -- > 2.25.1 applied to mips-next. Thomas.
diff --git a/arch/mips/kernel/mips-cpc.c b/arch/mips/kernel/mips-cpc.c index 8d2535123f11c8f3..17aff13cd7ce6ea7 100644 --- a/arch/mips/kernel/mips-cpc.c +++ b/arch/mips/kernel/mips-cpc.c @@ -4,6 +4,7 @@ * Author: Paul Burton <paul.burton@mips.com> */ +#include <linux/bitfield.h> #include <linux/errno.h> #include <linux/percpu.h> #include <linux/of.h> @@ -97,7 +98,7 @@ void mips_cpc_lock_other(unsigned int core) curr_core = cpu_core(¤t_cpu_data); spin_lock_irqsave(&per_cpu(cpc_core_lock, curr_core), per_cpu(cpc_core_lock_flags, curr_core)); - write_cpc_cl_other(core << __ffs(CPC_Cx_OTHER_CORENUM)); + write_cpc_cl_other(FIELD_PREP(CPC_Cx_OTHER_CORENUM, core)); /* * Ensure the core-other region reflects the appropriate core &
Use the FIELD_PREP() helper, instead of open-coding the same operation. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Compile-tested only. See "[PATCH 00/17] Non-const bitfield helper conversions" (https://lore.kernel.org/r/cover.1637592133.git.geert+renesas@glider.be) for background and more conversions. --- arch/mips/kernel/mips-cpc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)