From: SF Markus Elfring <elfring@users.sourceforge.net>
To: ibm-acpi-devel@lists.sourceforge.net,
platform-driver-x86@vger.kernel.org,
Andy Shevchenko <andy@infradead.org>,
Darren Hart <dvhart@infradead.org>,
Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 1/2] platform/x86/thinkpad_acpi: Delete an error message for a failed memory allocation in th
Date: Mon, 18 Dec 2017 21:28:01 +0000 [thread overview]
Message-ID: <d4096def-3e50-57df-2f3b-57f71d43371e@users.sourceforge.net> (raw)
In-Reply-To: <81459d11-693a-eb51-9173-9c189677f422@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 18 Dec 2017 22:08:49 +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 <elfring@users.sourceforge.net>
---
drivers/platform/x86/thinkpad_acpi.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 117be48ff4de..729144925880 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -816,10 +816,8 @@ static int __init register_tpacpi_subdriver(struct ibm_struct *ibm)
BUG_ON(!ibm->acpi);
ibm->acpi->driver = kzalloc(sizeof(struct acpi_driver), GFP_KERNEL);
- if (!ibm->acpi->driver) {
- pr_err("failed to allocate memory for ibm->acpi->driver\n");
+ if (!ibm->acpi->driver)
return -ENOMEM;
- }
sprintf(ibm->acpi->driver->name, "%s_%s", TPACPI_NAME, ibm->name);
ibm->acpi->driver->ids = ibm->acpi->hid;
@@ -3639,7 +3637,6 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
hotkey_keycode_map = kmalloc(TPACPI_HOTKEY_MAP_SIZE,
GFP_KERNEL);
if (!hotkey_keycode_map) {
- pr_err("failed to allocate memory for key map\n");
res = -ENOMEM;
goto err_exit;
}
@@ -5996,10 +5993,8 @@ static int __init led_init(struct ibm_init_struct *iibm)
tpacpi_leds = kzalloc(sizeof(*tpacpi_leds) * TPACPI_LED_NUMLEDS,
GFP_KERNEL);
- if (!tpacpi_leds) {
- pr_err("Out of memory for LED data\n");
+ if (!tpacpi_leds)
return -ENOMEM;
- }
for (i = 0; i < TPACPI_LED_NUMLEDS; i++) {
tpacpi_leds[i].led = -1;
--
2.15.1
next prev parent reply other threads:[~2017-12-18 21:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-18 21:26 [PATCH 0/2] platform/x86/thinkpad_acpi: Adjustments for four function implementations SF Markus Elfring
2017-12-18 21:28 ` SF Markus Elfring [this message]
2017-12-18 21:30 ` [PATCH 2/2] platform/x86/thinkpad_acpi: Improve a size determination in tpacpi_new_rfkill() SF Markus Elfring
2017-12-19 14:37 ` [PATCH 0/2] platform/x86/thinkpad_acpi: Adjustments for four function implementations Andy Shevchenko
2017-12-19 16:23 ` SF Markus Elfring
2017-12-19 17:28 ` Andy Shevchenko
2017-12-23 1:40 ` Henrique de Moraes Holschuh
2017-12-23 7:12 ` SF Markus Elfring
2018-01-03 0:10 ` Darren Hart
2018-01-03 0:49 ` Joe Perches
2018-01-03 1:13 ` Darren Hart
2018-01-03 8:41 ` SF Markus Elfring
2018-01-06 1:26 ` Darren Hart
2018-01-06 8:55 ` SF Markus Elfring
2017-12-23 1:29 ` [PATCH 0/2] " Henrique de Moraes Holschuh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d4096def-3e50-57df-2f3b-57f71d43371e@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=ibm-acpi-devel@lists.sourceforge.net \
--cc=ibm-acpi@hmh.eng.br \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox