m68k: mm: Remove superfluous memblock_alloc*() casts
Geert Uytterhoeven
maintainerPATCH 1/1 m68k: mm: Remove superfluous memblock_alloc*() casts
The return type of memblock_alloc*() is a void pointer, so there is no need to cast it to "void *" or some other pointer type, before assigning it to a pointer variable.
--- arch/m68k/mm/mcfmmu.c | 2 +- arch/m68k/mm/motorola.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)
arch/m68k/mm/mcfmmu.c +1 -1
@@ -42,7 +42,7 @@ void __init paging_init(void)unsigned long max_zone_pfn[MAX_NR_ZONES ] = {0 };int i; - empty_zero_page = (void *)memblock_alloc (PAGE_SIZE ,PAGE_SIZE ); + empty_zero_page =memblock_alloc (PAGE_SIZE ,PAGE_SIZE );if (!empty_zero_page)panic ("%s: Failed to allocate %lu bytes align=0x%lx\n" , __func__,PAGE_SIZE ,PAGE_SIZE );
arch/m68k/mm/motorola.c +2 -3
@@ -227,7 +227,7 @@ static pte_t * __init kernel_page_table(void)pte_t *pte_table = last_pte_table;if (PAGE_ALIGNED (last_pte_table)) { - pte_table = (pte_t *)memblock_alloc_low (PAGE_SIZE ,PAGE_SIZE ); + pte_table =memblock_alloc_low (PAGE_SIZE ,PAGE_SIZE );if (!pte_table) {panic ("%s: Failed to allocate %lu bytes align=%lx\n" , __func__,PAGE_SIZE ,PAGE_SIZE );
@@ -275,8 +275,7 @@ static pmd_t * __init kernel_ptr_table(void) last_pmd_table +=PTRS_PER_PMD ;if (PAGE_ALIGNED (last_pmd_table)) { - last_pmd_table = (pmd_t *)memblock_alloc_low (PAGE_SIZE , -PAGE_SIZE ); + last_pmd_table =memblock_alloc_low (PAGE_SIZE ,PAGE_SIZE );if (!last_pmd_table)panic ("%s: Failed to allocate %lu bytes align=%lx\n" , __func__,PAGE_SIZE ,PAGE_SIZE );
Signature · 1 line
2.17.1
Quoted 5 lines · Geert Uytterhoeven
The return type of memblock_alloc*() is a void pointer, so there is no need to cast it to "void *" or some other pointer type, before assigning it to a pointer variable.
Signed-off-by Geert Uytterhoeven <[email protected]>
Quoted 44 lines
--- arch/m68k/mm/mcfmmu.c | 2 +- arch/m68k/mm/motorola.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)arch/m68k/mm/mcfmmu.c +1
-1@@ -42,7 +42,7 @@ void __init paging_init(void)unsigned long max_zone_pfn[MAX_NR_ZONES ] = {0 };int i; - empty_zero_page = (void *)memblock_alloc (PAGE_SIZE ,PAGE_SIZE ); + empty_zero_page =memblock_alloc (PAGE_SIZE ,PAGE_SIZE );if (!empty_zero_page)panic ("%s: Failed to allocate %lu bytes align=0x%lx\n" , __func__,PAGE_SIZE ,PAGE_SIZE );arch/m68k/mm/motorola.c +2
-3@@ -227,7 +227,7 @@ static pte_t * __init kernel_page_table(void)pte_t *pte_table = last_pte_table;if (PAGE_ALIGNED (last_pte_table)) { - pte_table = (pte_t *)memblock_alloc_low (PAGE_SIZE ,PAGE_SIZE ); + pte_table =memblock_alloc_low (PAGE_SIZE ,PAGE_SIZE );if (!pte_table) {panic ("%s: Failed to allocate %lu bytes align=%lx\n" , __func__,PAGE_SIZE ,PAGE_SIZE );@@ -275,8 +275,7 @@ static pmd_t * __init kernel_ptr_table(void) last_pmd_table +=PTRS_PER_PMD ;if (PAGE_ALIGNED (last_pmd_table)) { - last_pmd_table = (pmd_t *)memblock_alloc_low (PAGE_SIZE , -PAGE_SIZE ); + last_pmd_table =memblock_alloc_low (PAGE_SIZE ,PAGE_SIZE );if (!last_pmd_table)panic ("%s: Failed to allocate %lu bytes align=%lx\n" , __func__,PAGE_SIZE ,PAGE_SIZE );Signature · 1 line
2.17.1
Signature · 2 lines
Sincerely yours, Mike.
Hi Geert,
Quoted 5 lines · Geert Uytterhoeven
The return type of memblock_alloc*() is a void pointer, so there is no need to cast it to "void *" or some other pointer type, before assigning it to a pointer variable.
Signed-off-by Geert Uytterhoeven <[email protected]>
Regards
Greg
Quoted 41 lines
arch/m68k/mm/mcfmmu.c | 2 +- arch/m68k/mm/motorola.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)arch/m68k/mm/mcfmmu.c +1
-1@@ -42,7 +42,7 @@ void __init paging_init(void)unsigned long max_zone_pfn[MAX_NR_ZONES ] = {0 };int i; - empty_zero_page = (void *)memblock_alloc (PAGE_SIZE ,PAGE_SIZE ); + empty_zero_page =memblock_alloc (PAGE_SIZE ,PAGE_SIZE );if (!empty_zero_page)panic ("%s: Failed to allocate %lu bytes align=0x%lx\n" , __func__,PAGE_SIZE ,PAGE_SIZE );arch/m68k/mm/motorola.c +2
-3@@ -227,7 +227,7 @@ static pte_t * __init kernel_page_table(void)pte_t *pte_table = last_pte_table;if (PAGE_ALIGNED (last_pte_table)) { - pte_table = (pte_t *)memblock_alloc_low (PAGE_SIZE ,PAGE_SIZE ); + pte_table =memblock_alloc_low (PAGE_SIZE ,PAGE_SIZE );if (!pte_table) {panic ("%s: Failed to allocate %lu bytes align=%lx\n" , __func__,PAGE_SIZE ,PAGE_SIZE );@@ -275,8 +275,7 @@ static pmd_t * __init kernel_ptr_table(void) last_pmd_table +=PTRS_PER_PMD ;if (PAGE_ALIGNED (last_pmd_table)) { - last_pmd_table = (pmd_t *)memblock_alloc_low (PAGE_SIZE , -PAGE_SIZE ); + last_pmd_table =memblock_alloc_low (PAGE_SIZE ,PAGE_SIZE );if (!last_pmd_table)panic ("%s: Failed to allocate %lu bytes align=%lx\n" , __func__,PAGE_SIZE ,PAGE_SIZE );
Geert Uytterhoeven
maintainerQuoted 5 lines · Geert Uytterhoeven
The return type of memblock_alloc*() is a void pointer, so there is no need to cast it to "void *" or some other pointer type, before assigning it to a pointer variable.
Signed-off-by Geert Uytterhoeven <[email protected]>
Thanks, queueing in the m68k for-v5.10 branch.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds