2021-12-07 12:55:33

by 王擎

Subject: [PATCH] x86: mm: use WARN_ONCE instead of printk and WARN_ON_ONCE

From: Wang Qing <[email protected]>

Simply use WARN_ONCE instead of printk(KERN_WARNING, ...) and WARN_ON_ONCE.

Signed-off-by: Wang Qing <[email protected]>
---
arch/x86/mm/ioremap.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 026031b..af9a321
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -195,9 +195,8 @@ __ioremap_caller(resource_size_t phys_addr, unsigned long size,
return NULL;

if (!phys_addr_valid(phys_addr)) {
- printk(KERN_WARNING "ioremap: invalid physical address %llx\n",
- (unsigned long long)phys_addr);
- WARN_ON_ONCE(1);
+ WARN_ONCE(1, "ioremap: invalid physical address %llx\n",
+ (unsigned long long)phys_addr);
return NULL;
}

--
2.7.4

2021-12-07 14:10:18

by Borislav Petkov

Subject: Re: [PATCH] x86: mm: use WARN_ONCE instead of printk and WARN_ON_ONCE

On Tue, Dec 07, 2021 at 04:55:00AM -0800, Qing Wang wrote:
> From: Wang Qing <[email protected]>
>
> Simply use WARN_ONCE instead of printk(KERN_WARNING, ...) and WARN_ON_ONCE.
>
> Signed-off-by: Wang Qing <[email protected]>
> ---
> arch/x86/mm/ioremap.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
> index 026031b..af9a321
> --- a/arch/x86/mm/ioremap.c
> +++ b/arch/x86/mm/ioremap.c
> @@ -195,9 +195,8 @@ __ioremap_caller(resource_size_t phys_addr, unsigned long size,
> return NULL;
>
> if (!phys_addr_valid(phys_addr)) {
> - printk(KERN_WARNING "ioremap: invalid physical address %llx\n",
> - (unsigned long long)phys_addr);
> - WARN_ON_ONCE(1);
> + WARN_ONCE(1, "ioremap: invalid physical address %llx\n",
> + (unsigned long long)phys_addr);
> return NULL;
> }
>
> --

This is not an equivalent transformation.

--
Regards/Gruss,
Boris.

https://people.kernel.org/tglx/notes-about-netiquette