2022-09-29 08:00:20

by Tiezhu Yang

Subject: [PATCH 0/2] Silence warning and simplify code

Tiezhu Yang (2):
MIPS: Silence missing prototype warning
MIPS: Simplify __bswapdi2() and __bswapsi2()

arch/mips/lib/bswapdi.c | 14 +++++---------
arch/mips/lib/bswapsi.c | 10 +++++-----
2 files changed, 10 insertions(+), 14 deletions(-)

--
2.1.0

2022-09-29 08:11:32

by Tiezhu Yang

Subject: [PATCH 2/2] MIPS: Simplify __bswapdi2() and __bswapsi2()

Use macro definitions ___constant_swab64 and ___constant_swab32
to simplify __bswapdi2() and __bswapsi2().

Signed-off-by: Tiezhu Yang <[email protected]>
---
arch/mips/lib/bswapdi.c | 10 ++--------
arch/mips/lib/bswapsi.c | 6 ++----
2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/arch/mips/lib/bswapdi.c b/arch/mips/lib/bswapdi.c
index 1d020e1..88242dc 100644
--- a/arch/mips/lib/bswapdi.c
+++ b/arch/mips/lib/bswapdi.c
@@ -1,19 +1,13 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/export.h>
#include <linux/compiler.h>
+#include <uapi/linux/swab.h>

/* To silence -Wmissing-prototypes. */
unsigned long long __bswapdi2(unsigned long long u);

unsigned long long notrace __bswapdi2(unsigned long long u)
{
- return (((u) & 0xff00000000000000ull) >> 56) |
- (((u) & 0x00ff000000000000ull) >> 40) |
- (((u) & 0x0000ff0000000000ull) >> 24) |
- (((u) & 0x000000ff00000000ull) >> 8) |
- (((u) & 0x00000000ff000000ull) << 8) |
- (((u) & 0x0000000000ff0000ull) << 24) |
- (((u) & 0x000000000000ff00ull) << 40) |
- (((u) & 0x00000000000000ffull) << 56);
+ return ___constant_swab64(u);
}
EXPORT_SYMBOL(__bswapdi2);
diff --git a/arch/mips/lib/bswapsi.c b/arch/mips/lib/bswapsi.c
index 02d9df4..2ed6554 100644
--- a/arch/mips/lib/bswapsi.c
+++ b/arch/mips/lib/bswapsi.c
@@ -1,15 +1,13 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/export.h>
#include <linux/compiler.h>
+#include <uapi/linux/swab.h>

/* To silence -Wmissing-prototypes. */
unsigned int __bswapsi2(unsigned int u);

unsigned int notrace __bswapsi2(unsigned int u)
{
- return (((u) & 0xff000000) >> 24) |
- (((u) & 0x00ff0000) >> 8) |
- (((u) & 0x0000ff00) << 8) |
- (((u) & 0x000000ff) << 24);
+ return ___constant_swab32(u);
}
EXPORT_SYMBOL(__bswapsi2);
--
2.1.0

2022-09-30 15:29:31

by Thomas Bogendoerfer

Subject: Re: [PATCH 0/2] Silence warning and simplify code

On Thu, Sep 29, 2022 at 03:39:56PM +0800, Tiezhu Yang wrote:
> Tiezhu Yang (2):
> MIPS: Silence missing prototype warning
> MIPS: Simplify __bswapdi2() and __bswapsi2()
>
> arch/mips/lib/bswapdi.c | 14 +++++---------
> arch/mips/lib/bswapsi.c | 10 +++++-----
> 2 files changed, 10 insertions(+), 14 deletions(-)

series applied to mips-next.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]