From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Sat, 27 Jan 2018 13:35:02 +0100

Omit extra messages for a memory allocation failure in this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/input/keyboard/matrix_keypad.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/input/keyboard/matrix_keypad.c 
b/drivers/input/keyboard/matrix_keypad.c
index 1f316d66e6f7..90238201a9cc 100644
--- a/drivers/input/keyboard/matrix_keypad.c
+++ b/drivers/input/keyboard/matrix_keypad.c
@@ -413,10 +413,8 @@ matrix_keypad_parse_dt(struct device *dev)
        }
 
        pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
-       if (!pdata) {
-               dev_err(dev, "could not allocate memory for platform data\n");
+       if (!pdata)
                return ERR_PTR(-ENOMEM);
-       }
 
        pdata->num_row_gpios = nrow = of_gpio_named_count(np, "row-gpios");
        pdata->num_col_gpios = ncol = of_gpio_named_count(np, "col-gpios");
@@ -445,10 +443,8 @@ matrix_keypad_parse_dt(struct device *dev)
                             sizeof(unsigned int) *
                                (pdata->num_row_gpios + pdata->num_col_gpios),
                             GFP_KERNEL);
-       if (!gpios) {
-               dev_err(dev, "could not allocate memory for gpios\n");
+       if (!gpios)
                return ERR_PTR(-ENOMEM);
-       }
 
        for (i = 0; i < pdata->num_row_gpios; i++)
                gpios[i] = of_get_named_gpio(np, "row-gpios", i);
-- 
2.16.1

Reply via email to