From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227Gd2/pmRVbpoDYA2Ve3UMoWuZ9HJSWsP+FSr7R+7Zk8MtvD8rSwzJj6N7Ik8iZKgFQWgFV ARC-Seal: i=1; a=rsa-sha256; t=1517061305; cv=none; d=google.com; s=arc-20160816; b=hq7giuNhKRtXA54YG8+/V6+hT0qgoy0VZxiy29owm5cPbDrra2x3gwyZIXyZz9Rz8D 0z+RL0FECOY1db4kRXVINOzBwzAimwN+2IJkKDi/vJqD4GJ6ANz5HhmDrLT9JQ0Xi+ed 4tU/1naiIFKeienCEyQZZefPhgkLr20Z2RmmxXMGztHfqDCLXS9Lvf0CVzJmoetlopZp 7jzvB4tgxKJCCnfoD1rZzaM7A0RLp6yFjCrf4mE5Q6fMyvpDbbPlO/7B2Vmjdw+Ieaa4 B4/spSSJlxvM078vYQXBFmRsS1vgbA3uoj/gcgOe00wzsDFY42EyWhEGpWHAQXDvTdLQ ewgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:cc:to:arc-authentication-results; bh=jk0BNJvRj4Gh7gYtUTlr29R3MIk9rOAPiHK18OI2PqQ=; b=qVOKqKXgSKE131JMy2vmH1AP4oNelJo+wtk2l63KlANmXgAw0IcJfAySbMoQJp1tz/ i3xzn/+7oncFztrfMsT5t4laokcEcKWFmjP32IfSHCHcJZq75CAkbHRkfOPDailvd3ay bvn+JYlf5B+tm0ewV7LYsp1w+9yTbYgLtCO9LCqqrgJvlDCrcwQsHMOVee4I4cIK16Hw jmVdb0FTvp+w3IwVMEuYa2FuGzfNRf6HLtlYEJCCaEhTiNzeLehUqupYOC7WnFk9zCs5 3fAasr/Tz24uNLgYP/fWlfG3fLKs9LsUwnDvD+TPobGlW64YedxtLxN8ZiTR7rNj1waa YJng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of elfring@users.sourceforge.net designates 212.227.17.12 as permitted sender) smtp.mailfrom=elfring@users.sourceforge.net; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=sourceforge.net Authentication-Results: mx.google.com; spf=pass (google.com: domain of elfring@users.sourceforge.net designates 212.227.17.12 as permitted sender) smtp.mailfrom=elfring@users.sourceforge.net; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=sourceforge.net To: linux-input@vger.kernel.org, Arvind Yadav , Boris Brezillon , Dmitry Torokhov , Greg Kroah-Hartman , =?UTF-8?B?R8O8bnRlciBSw7Zjaw==?= , Jacek Anaszewski , Joseph Lo , Linus Walleij , Stephen Lu Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] Input: gpio_keys: Delete an error message for a failed memory allocation in two functions Message-ID: <6a34d439-6465-db9b-e8de-3f3b5b1ca257@users.sourceforge.net> Date: Sat, 27 Jan 2018 14:55:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:w0UoCY1lzCM+KT9lH6nadZmx0F2BUrDu+7sRIA85t27IrMKIhA3 BYZVy80Ij1f6h9QDoaF2yC8dpTJwnpMolRu9Kv3Bj5iXAOykafZ1DAR7lgK8DjUktBfBJJK eGZy2CNsunhrM44cd+pw3G/x7/erVvt3qClZbwdVcHQciOFqjXpOTNPokXWoQM1i10vAsWE Y9Avzs9iiv7Txg1s9GtAw== X-UI-Out-Filterresults: notjunk:1;V01:K0:vXBmZpbVDkM=:lJydkTmJJi4ZoOIgbIP5CU jewBlEDJEqX02O8UXwk8PFyq6GKBKFReATMPt08WIWv7bUpcbZi5yMM7LYQsFtFb8c9K+N7eA 33iRbCbyUU4+NbJDaCUJzP3GvjOIYAXBSctOYZxnM3s/VTttLvi8h9D5tkmzIRnGe2aqqJ7Q1 /F4Cd1ysjR2sWZZS0u8ZYvPURNzqoev49nlaUeEeS0ASyUDLuCy7dfz+3fiHyk+J38+f9KDPi D9+fykJSf2Q2QZ4rrMEJQiwJdcGWEVqSVeH4SBEqhAdgE7jeVqgvLUwZfmKxWYHoAlQAu2x35 u59E17ubjUQl2VQ/wiY4cx31zg4RsyFtbQs59ueM1LS/vkejBj3bQdGxHorCCeGLIPbQj5NTs Vv5nR8XuSHRoSS/yRPsPuE0vzOTcawjTJUjfyoKBYMs7woFrKs7AAC89uZX/F2nT8QC97pse3 vQhCLgp5gAv0dJpwtZUZM8t7wiD2yDdlKZwybE5YUc9tSbK/Rqa20qjP/5n2Fn7BUdPW0m58d uSuHPHBcFvl5L++qBDHdHWKZmMzgQuxcAWuQKYbPcKYLc3cpCTbs87iWAxPsuFfOIRJRfv/8G 72XkgSFmXGg/RCRJ6WDxYXdGEaByNWATqueRufnfvac7u2cIqcOKaJ7Kwo7bT2xQQpU/nzEjx 7mshCkBYeL/d4e9Dnkymepjj44YsfGv9GQMyvi/sor5Llanad4sfTHOT3kGqiCU/emYzlDRHN nHR4wqzrIVNB8Mnl7f/MtPz2uKmX8ZZpx4ROKese2/7dM8bwfFakQCZC0rSBQzDZIUG2iwtN3 9cPPRYhv+ULDltYwr/mG7U+hEvKjAOotwvDgStS3ArNEoKISg4= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590754075362497597?= X-GMAIL-MSGID: =?utf-8?q?1590754075362497597?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Markus Elfring Date: Sat, 27 Jan 2018 14:42:19 +0100 Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/input/keyboard/gpio_keys.c | 4 +--- drivers/input/keyboard/gpio_keys_polled.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 87e613dc33b8..d12fccf923d2 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -757,10 +757,8 @@ static int gpio_keys_probe(struct platform_device *pdev) size = sizeof(struct gpio_keys_drvdata) + pdata->nbuttons * sizeof(struct gpio_button_data); ddata = devm_kzalloc(dev, size, GFP_KERNEL); - if (!ddata) { - dev_err(dev, "failed to allocate state\n"); + if (!ddata) return -ENOMEM; - } ddata->keymap = devm_kcalloc(dev, pdata->nbuttons, sizeof(ddata->keymap[0]), diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index edc7262103b9..c79b1a75d036 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c @@ -253,10 +253,8 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) size = sizeof(struct gpio_keys_polled_dev) + pdata->nbuttons * sizeof(struct gpio_keys_button_data); bdev = devm_kzalloc(dev, size, GFP_KERNEL); - if (!bdev) { - dev_err(dev, "no memory for private data\n"); + if (!bdev) return -ENOMEM; - } poll_dev = devm_input_allocate_polled_device(dev); if (!poll_dev) { -- 2.16.1