m68k: mm: Remove superfluous memblock_alloc*() casts
diff mbox series

Message ID 20200826130444.25618-1-geert@linux-m68k.org
State Accepted
Commit 7e158826564fbbb7284dabbaf71b6c3227845f51
Headers show
Series
  • m68k: mm: Remove superfluous memblock_alloc*() casts
Related show

Commit Message

Geert Uytterhoeven Aug. 26, 2020, 1:04 p.m. UTC
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 <geert@linux-m68k.org>
---
 arch/m68k/mm/mcfmmu.c   | 2 +-
 arch/m68k/mm/motorola.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

Comments

Mike Rapoport Aug. 26, 2020, 1:31 p.m. UTC | #1
On Wed, Aug 26, 2020 at 03:04:44PM +0200, Geert Uytterhoeven wrote:
> 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 <geert@linux-m68k.org>

Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>

> ---
>  arch/m68k/mm/mcfmmu.c   | 2 +-
>  arch/m68k/mm/motorola.c | 5 ++---
>  2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c
> index 2b9cb4a622811390..eac9dde65193443e 100644
> --- a/arch/m68k/mm/mcfmmu.c
> +++ b/arch/m68k/mm/mcfmmu.c
> @@ -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);
> diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c
> index a9bdde54ca350197..3a653f0a4188d4af 100644
> --- a/arch/m68k/mm/motorola.c
> +++ b/arch/m68k/mm/motorola.c
> @@ -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);
> -- 
> 2.17.1
>
Greg Ungerer Aug. 27, 2020, 12:13 a.m. UTC | #2
Hi Geert,

On 26/8/20 11:04 pm, Geert Uytterhoeven wrote:
> 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 <geert@linux-m68k.org>

Acked-by: Greg Ungerer <gerg@linux-m68k.org>

Regards
Greg


>   arch/m68k/mm/mcfmmu.c   | 2 +-
>   arch/m68k/mm/motorola.c | 5 ++---
>   2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c
> index 2b9cb4a622811390..eac9dde65193443e 100644
> --- a/arch/m68k/mm/mcfmmu.c
> +++ b/arch/m68k/mm/mcfmmu.c
> @@ -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);
> diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c
> index a9bdde54ca350197..3a653f0a4188d4af 100644
> --- a/arch/m68k/mm/motorola.c
> +++ b/arch/m68k/mm/motorola.c
> @@ -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 Sept. 7, 2020, 8:49 a.m. UTC | #3
On Wed, Aug 26, 2020 at 3:04 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> 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 <geert@linux-m68k.org>

Thanks, queueing in the m68k for-v5.10 branch.

Gr{oetje,eeting}s,

                        Geert

Patch
diff mbox series

diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c
index 2b9cb4a622811390..eac9dde65193443e 100644
--- a/arch/m68k/mm/mcfmmu.c
+++ b/arch/m68k/mm/mcfmmu.c
@@ -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);
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c
index a9bdde54ca350197..3a653f0a4188d4af 100644
--- a/arch/m68k/mm/motorola.c
+++ b/arch/m68k/mm/motorola.c
@@ -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);