Commit 7e158826 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Acked-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
Link: https://lore.kernel.org/r/20200826130444.25618-1-geert@linux-m68k.org
parent 41f1bf37

arch/m68k/mm/mcfmmu.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE