2017-12-08 19:00:49

by SF Markus Elfring

Subject: [PATCH] serial: max310x: Delete an error message for a failed memory allocation in max310x_probe()

From: Markus Elfring <[email protected]>
Date: Fri, 8 Dec 2017 19:53:10 +0100

Omit an extra message for a memory allocation failure in this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <[email protected]>
---
drivers/tty/serial/max310x.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index ecb6513a6505..2aad36f402fd 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -1102,10 +1102,8 @@ static int max310x_probe(struct device *dev, struct max310x_devtype *devtype,
/* Alloc port structure */
s = devm_kzalloc(dev, sizeof(*s) +
sizeof(struct max310x_one) * devtype->nr, GFP_KERNEL);
- if (!s) {
- dev_err(dev, "Error allocating port structure\n");
+ if (!s)
return -ENOMEM;
- }

clk_osc = devm_clk_get(dev, "osc");
clk_xtal = devm_clk_get(dev, "xtal");
--
2.15.1

2017-12-08 20:02:21

by Jan Kundrát

Subject: Re: [PATCH] serial: max310x: Delete an error message for a failed memory allocation in max310x_probe()

On pátek 8. prosince 2017 20:00:34 CET, SF Markus Elfring wrote:
> From: Markus Elfring <[email protected]>
> Date: Fri, 8 Dec 2017 19:53:10 +0100
>
> Omit an extra message for a memory allocation failure in this function.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <[email protected]>
> ---
> drivers/tty/serial/max310x.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
> index ecb6513a6505..2aad36f402fd 100644
> --- a/drivers/tty/serial/max310x.c
> +++ b/drivers/tty/serial/max310x.c
> @@ -1102,10 +1102,8 @@ static int max310x_probe(struct device
> *dev, struct max310x_devtype *devtype,
> /* Alloc port structure */
> s = devm_kzalloc(dev, sizeof(*s) +
> sizeof(struct max310x_one) * devtype->nr, GFP_KERNEL);
> - if (!s) {
> - dev_err(dev, "Error allocating port structure\n");
> + if (!s)
> return -ENOMEM;
> - }
>
> clk_osc = devm_clk_get(dev, "osc");
> clk_xtal = devm_clk_get(dev, "xtal");

I'm looking at this patch because I'm also making some modifications to
this driver. This patch makes sense; other drivers also simply return
ENOMEM. Tested on ARM, Armada 388; the "good" code path still obviously
works :).

Reviewed-by: Jan Kundrát <[email protected]>