2017-08-04 14:47:07

by SF Markus Elfring

Subject: [PATCH] powerpc/eeh: Delete an error message for a failed memory allocation in two functions

From: Markus Elfring <[email protected]>
Date: Fri, 4 Aug 2017 16:37:56 +0200

Omit an extra message for a memory allocation failure in these functions.

This issue was detected by using the Coccinelle software.

Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
Signed-off-by: Markus Elfring <[email protected]>
---
arch/powerpc/kernel/eeh_dev.c | 5 +----
arch/powerpc/kernel/eeh_event.c | 5 ++---
2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/kernel/eeh_dev.c b/arch/powerpc/kernel/eeh_dev.c
index d6b2ca70d14d..2742ecbadf18 100644
--- a/arch/powerpc/kernel/eeh_dev.c
+++ b/arch/powerpc/kernel/eeh_dev.c
@@ -55,11 +55,8 @@ struct eeh_dev *eeh_dev_init(struct pci_dn *pdn)

/* Allocate EEH device */
edev = kzalloc(sizeof(*edev), GFP_KERNEL);
- if (!edev) {
- pr_warn("%s: out of memory\n",
- __func__);
+ if (!edev)
return NULL;
- }

/* Associate EEH device with OF node */
pdn->edev = edev;
diff --git a/arch/powerpc/kernel/eeh_event.c b/arch/powerpc/kernel/eeh_event.c
index accbf8b5fd46..c62bd90e038f 100644
--- a/arch/powerpc/kernel/eeh_event.c
+++ b/arch/powerpc/kernel/eeh_event.c
@@ -132,10 +132,9 @@ int eeh_send_failure_event(struct eeh_pe *pe)
struct eeh_event *event;

event = kzalloc(sizeof(*event), GFP_ATOMIC);
- if (!event) {
- pr_err("EEH: out of memory, event not handled\n");
+ if (!event)
return -ENOMEM;
- }
+
event->pe = pe;

/* We may or may not be called in an interrupt context */
--
2.13.4

2017-09-01 13:29:58

by Michael Ellerman

Subject: Re: powerpc/eeh: Delete an error message for a failed memory allocation in two functions

On Fri, 2017-08-04 at 14:46:51 UTC, SF Markus Elfring wrote:
> From: Markus Elfring <[email protected]>
> Date: Fri, 4 Aug 2017 16:37:56 +0200
>
> Omit an extra message for a memory allocation failure in these functions.
>
> This issue was detected by using the Coccinelle software.
>
> Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
> Signed-off-by: Markus Elfring <[email protected]>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/6ab41161b44a3b4d504ac29c9dd997

cheers

2017-09-05 11:52:35

by SF Markus Elfring

Subject: Re: powerpc/eeh: Delete an error message for a failed memory allocation in two functions

> Applied to powerpc next, thanks.
>
> https://git.kernel.org/powerpc/c/6ab41161b44a3b4d504ac29c9dd997

Thanks that you picked another update suggestion up.

* It might matter to mention that only one patch hunk was accepted in this case.

* Can it be that the adjusted commit subject does contain a typo at the moment?
Would the wording “powerpc/eeh: Delete a message for an "out of memory error"
(at init time)” be more appropriate there?

Regards,
Markus