Skip to contentSkip to conversation

arch: Cleanup unused functions

PATCH Superseded [email protected] 4 participants 7 messages May 25, 2021 – May 30, 2021

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arch: Cleanup unused functions

From: Guo Ren <[email protected]>

These functions haven't been used, so just remove them. The patch has been tested with riscv, but I only use grep to check the microblaze's.

Cc Arnd Bergmann <[email protected]>
Cc Michal Simek <[email protected]>
Cc Christoph Hellwig <[email protected]>
---
 arch/microblaze/include/asm/page.h |  3 ---
 arch/riscv/include/asm/page.h      | 10 ----------
 2 files changed, 13 deletions(-)
arch/microblaze/include/asm/page.h +0 -3
index bf681f2..ce55097 100644
@@ -35,9 +35,6 @@
 
 #define ARCH_SLAB_MINALIGN	L1_CACHE_BYTES
 
-#define PAGE_UP(addr)	(((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr)	((addr)&(~((PAGE_SIZE)-1)))
-
 /*
  * PAGE_OFFSET -- the first address of the first page of memory. With MMU
  * it is set to the kernel start address (aligned on a page boundary).
arch/riscv/include/asm/page.h +0 -10
index 6a7761c..a1b888f 100644
@@ -37,16 +37,6 @@
 
 #ifndef __ASSEMBLY__
 
-#define PAGE_UP(addr)	(((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr)	((addr)&(~((PAGE_SIZE)-1)))
-
-/* align addr on a size boundary - adjust address up/down if needed */
-#define _ALIGN_UP(addr, size)	(((addr)+((size)-1))&(~((size)-1)))
-#define _ALIGN_DOWN(addr, size)	((addr)&(~((size)-1)))
-
-/* align addr on a size boundary - adjust address up if needed */
-#define _ALIGN(addr, size)	_ALIGN_UP(addr, size)
-
 #define clear_page(pgaddr)			memset((pgaddr), 0, PAGE_SIZE)
 #define copy_page(to, from)			memcpy((to), (from), PAGE_SIZE)
 
Signature · 1 line
2.7.4
Reviewed-by on v1 1/1
#2 lore raw
In reply to [email protected]
Quoted 11 lines · On Tue, May 25, 2021 at 5:52 PM <[email protected]> wrote:

From: Guo Ren <[email protected]>

These functions haven't been used, so just remove them. The patch has been tested with riscv, but I only use grep to check the microblaze's.

Cc Arnd Bergmann <[email protected]>
Cc Michal Simek <[email protected]>
Cc Christoph Hellwig <[email protected]>

Looks good to me.

Regards,
Anup

Quoted 43 lines
---
 arch/microblaze/include/asm/page.h |  3 ---
 arch/riscv/include/asm/page.h      | 10 ----------
 2 files changed, 13 deletions(-)
arch/microblaze/include/asm/page.h +0 -3
index bf681f2..ce55097 100644
@@ -35,9 +35,6 @@
 
 #define ARCH_SLAB_MINALIGN     L1_CACHE_BYTES
 
-#define PAGE_UP(addr)  (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr)        ((addr)&(~((PAGE_SIZE)-1)))
-
 /*
  * PAGE_OFFSET -- the first address of the first page of memory. With MMU
  * it is set to the kernel start address (aligned on a page boundary).
arch/riscv/include/asm/page.h +0 -11
index 6a7761c..a1b888f 100644
@@ -37,16 +37,6 @@
 
 #ifndef __ASSEMBLY__
 
-#define PAGE_UP(addr)  (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr)        ((addr)&(~((PAGE_SIZE)-1)))
-
-/* align addr on a size boundary - adjust address up/down if needed */
-#define _ALIGN_UP(addr, size)  (((addr)+((size)-1))&(~((size)-1)))
-#define _ALIGN_DOWN(addr, size)        ((addr)&(~((size)-1)))
-
-/* align addr on a size boundary - adjust address up if needed */
-#define _ALIGN(addr, size)     _ALIGN_UP(addr, size)
-
 #define clear_page(pgaddr)                     memset((pgaddr), 0, PAGE_SIZE)
 #define copy_page(to, from)                    memcpy((to), (from), PAGE_SIZE)
 
--

2.7.4

author Reviewed-by Christoph Hellwig Reviewed-by Anup Patel on v1 1/1
#3 lore raw
In reply to [email protected]

Hi Arnd,

Could you help add the patch to your next-tree?

Also, please append below:

Thx

Quoted 54 lines · On Tue, May 25, 2021 at 8:21 PM <[email protected]> wrote:

From: Guo Ren <[email protected]>

These functions haven't been used, so just remove them. The patch has been tested with riscv, but I only use grep to check the microblaze's.

Cc Arnd Bergmann <[email protected]>
Cc Michal Simek <[email protected]>
Cc Christoph Hellwig <[email protected]>
---
 arch/microblaze/include/asm/page.h |  3 ---
 arch/riscv/include/asm/page.h      | 10 ----------
 2 files changed, 13 deletions(-)
arch/microblaze/include/asm/page.h +0 -3
index bf681f2..ce55097 100644
@@ -35,9 +35,6 @@
 
 #define ARCH_SLAB_MINALIGN     L1_CACHE_BYTES
 
-#define PAGE_UP(addr)  (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr)        ((addr)&(~((PAGE_SIZE)-1)))
-
 /*
  * PAGE_OFFSET -- the first address of the first page of memory. With MMU
  * it is set to the kernel start address (aligned on a page boundary).
arch/riscv/include/asm/page.h +0 -11
index 6a7761c..a1b888f 100644
@@ -37,16 +37,6 @@
 
 #ifndef __ASSEMBLY__
 
-#define PAGE_UP(addr)  (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr)        ((addr)&(~((PAGE_SIZE)-1)))
-
-/* align addr on a size boundary - adjust address up/down if needed */
-#define _ALIGN_UP(addr, size)  (((addr)+((size)-1))&(~((size)-1)))
-#define _ALIGN_DOWN(addr, size)        ((addr)&(~((size)-1)))
-
-/* align addr on a size boundary - adjust address up if needed */
-#define _ALIGN(addr, size)     _ALIGN_UP(addr, size)
-
 #define clear_page(pgaddr)                     memset((pgaddr), 0, PAGE_SIZE)
 #define copy_page(to, from)                    memcpy((to), (from), PAGE_SIZE)
 
--

2.7.4

Signature · 4 lines
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/
Reviewed-by Acked-by on v1 1/1
#4 lore raw
In reply to [email protected]
Quoted 39 lines · On Tue, 25 May 2021 05:20:34 PDT (-0700), [email protected] wrote:

From: Guo Ren <[email protected]>

These functions haven't been used, so just remove them. The patch has been tested with riscv, but I only use grep to check the microblaze's.

Cc Arnd Bergmann <[email protected]>
Cc Michal Simek <[email protected]>
Cc Christoph Hellwig <[email protected]>
---
 arch/microblaze/include/asm/page.h |  3 ---
 arch/riscv/include/asm/page.h      | 10 ----------
 2 files changed, 13 deletions(-)
arch/microblaze/include/asm/page.h +0 -3
index bf681f2..ce55097 100644
@@ -35,9 +35,6 @@
 
 #define ARCH_SLAB_MINALIGN	L1_CACHE_BYTES
 
-#define PAGE_UP(addr)	(((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr)	((addr)&(~((PAGE_SIZE)-1)))
-
 /*
  * PAGE_OFFSET -- the first address of the first page of memory. With MMU
  * it is set to the kernel start address (aligned on a page boundary).
arch/riscv/include/asm/page.h +0 -2
index 6a7761c..a1b888f 100644
@@ -37,16 +37,6 @@
 
 #ifndef __ASSEMBLY__
 
-#define PAGE_UP(addr)	(((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr)	((addr)&(~((PAGE_SIZE)-1)))

arch/riscv/include/asm/page.h line 41

Quoted 10 lines
arch/riscv/include/asm/page.h +0 -8
-
-/* align addr on a size boundary - adjust address up/down if needed */
-#define _ALIGN_UP(addr, size)	(((addr)+((size)-1))&(~((size)-1)))
-#define _ALIGN_DOWN(addr, size)	((addr)&(~((size)-1)))
-
-/* align addr on a size boundary - adjust address up if needed */
-#define _ALIGN(addr, size)	_ALIGN_UP(addr, size)
-
 #define clear_page(pgaddr)			memset((pgaddr), 0, PAGE_SIZE)
 #define copy_page(to, from)			memcpy((to), (from), PAGE_SIZE)

It's generally easier if you split this sort of stuff up, as it'll be easier to merge if we don't have to coordinate between the trees. I'm happy to take this, but I'd prefer an Ack from one of the microblaze folks first.

author
#5 lore raw
Quoted 55 lines · Palmer Dabbelt
Quoted 39 lines · On Tue, 25 May 2021 05:20:34 PDT (-0700), [email protected] wrote:

From: Guo Ren <[email protected]>

These functions haven't been used, so just remove them. The patch has been tested with riscv, but I only use grep to check the microblaze's.

Cc Arnd Bergmann <[email protected]>
Cc Michal Simek <[email protected]>
Cc Christoph Hellwig <[email protected]>
---
 arch/microblaze/include/asm/page.h |  3 ---
 arch/riscv/include/asm/page.h      | 10 ----------
 2 files changed, 13 deletions(-)
arch/microblaze/include/asm/page.h +0 -3
index bf681f2..ce55097 100644
@@ -35,9 +35,6 @@
 
 #define ARCH_SLAB_MINALIGN   L1_CACHE_BYTES
 
-#define PAGE_UP(addr)        (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr)      ((addr)&(~((PAGE_SIZE)-1)))
-
 /*
  * PAGE_OFFSET -- the first address of the first page of memory. With MMU
  * it is set to the kernel start address (aligned on a page boundary).
arch/riscv/include/asm/page.h +0 -2
index 6a7761c..a1b888f 100644
@@ -37,16 +37,6 @@
 
 #ifndef __ASSEMBLY__
 
-#define PAGE_UP(addr)        (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr)      ((addr)&(~((PAGE_SIZE)-1)))

arch/riscv/include/asm/page.h line 41

Quoted 10 lines
arch/riscv/include/asm/page.h +0 -8
-
-/* align addr on a size boundary - adjust address up/down if needed */
-#define _ALIGN_UP(addr, size)        (((addr)+((size)-1))&(~((size)-1)))
-#define _ALIGN_DOWN(addr, size)      ((addr)&(~((size)-1)))
-
-/* align addr on a size boundary - adjust address up if needed */
-#define _ALIGN(addr, size)   _ALIGN_UP(addr, size)
-
 #define clear_page(pgaddr)                   memset((pgaddr), 0, PAGE_SIZE)
 #define copy_page(to, from)                  memcpy((to), (from), PAGE_SIZE)
Quoted 4 lines

It's generally easier if you split this sort of stuff up, as it'll be easier to merge if we don't have to coordinate between the trees. I'm happy to take this, but I'd prefer an Ack from one of the microblaze folks first.

Em ... I'll separate it. Thx for reply.

Signature · 4 lines
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/
#6 lore raw
Quoted 56 lines · On Sat, 29 May 2021 17:26:20 PDT (-0700), [email protected] wrote:
Quoted 55 lines · Palmer Dabbelt
Quoted 39 lines · On Tue, 25 May 2021 05:20:34 PDT (-0700), [email protected] wrote:

From: Guo Ren <[email protected]>

These functions haven't been used, so just remove them. The patch has been tested with riscv, but I only use grep to check the microblaze's.

Cc Arnd Bergmann <[email protected]>
Cc Michal Simek <[email protected]>
Cc Christoph Hellwig <[email protected]>
---
 arch/microblaze/include/asm/page.h |  3 ---
 arch/riscv/include/asm/page.h      | 10 ----------
 2 files changed, 13 deletions(-)
arch/microblaze/include/asm/page.h +0 -3
index bf681f2..ce55097 100644
@@ -35,9 +35,6 @@
 
 #define ARCH_SLAB_MINALIGN   L1_CACHE_BYTES
 
-#define PAGE_UP(addr)        (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr)      ((addr)&(~((PAGE_SIZE)-1)))
-
 /*
  * PAGE_OFFSET -- the first address of the first page of memory. With MMU
  * it is set to the kernel start address (aligned on a page boundary).
arch/riscv/include/asm/page.h +0 -2
index 6a7761c..a1b888f 100644
@@ -37,16 +37,6 @@
 
 #ifndef __ASSEMBLY__
 
-#define PAGE_UP(addr)        (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
-#define PAGE_DOWN(addr)      ((addr)&(~((PAGE_SIZE)-1)))

arch/riscv/include/asm/page.h line 41

Quoted 10 lines
arch/riscv/include/asm/page.h +0 -8
-
-/* align addr on a size boundary - adjust address up/down if needed */
-#define _ALIGN_UP(addr, size)        (((addr)+((size)-1))&(~((size)-1)))
-#define _ALIGN_DOWN(addr, size)      ((addr)&(~((size)-1)))
-
-/* align addr on a size boundary - adjust address up if needed */
-#define _ALIGN(addr, size)   _ALIGN_UP(addr, size)
-
 #define clear_page(pgaddr)                   memset((pgaddr), 0, PAGE_SIZE)
 #define copy_page(to, from)                  memcpy((to), (from), PAGE_SIZE)
Quoted 5 lines
Quoted 4 lines

It's generally easier if you split this sort of stuff up, as it'll be easier to merge if we don't have to coordinate between the trees. I'm happy to take this, but I'd prefer an Ack from one of the microblaze folks first.

Em ... I'll separate it. Thx for reply.

Thanks, I'll drop this and expect a new one to show up.