2020-08-26 13:07:13

by Geert Uytterhoeven

Subject: [PATCH] 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: Geert Uytterhoeven <[email protected]>
---
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

2020-08-26 13:32:55

by Mike Rapoport

Subject: Re: [PATCH] m68k: mm: Remove superfluous memblock_alloc*() casts

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 <[email protected]>

Reviewed-by: Mike Rapoport <[email protected]>

> ---
> 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
>

--
Sincerely yours,
Mike.

2020-08-27 00:15:21

by Greg Ungerer

Subject: Re: [PATCH] m68k: mm: Remove superfluous memblock_alloc*() casts

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 <[email protected]>

Acked-by: Greg Ungerer <[email protected]>

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);
>

2020-09-07 08:51:41

by Geert Uytterhoeven

Subject: Re: [PATCH] m68k: mm: Remove superfluous memblock_alloc*() casts

On Wed, Aug 26, 2020 at 3:04 PM Geert Uytterhoeven <[email protected]> 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 <[email protected]>

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

Gr{oetje,eeting}s,

Geert

--
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