* [PATCH 1/3] powerpc-opal: Delete ten error messages for a failed memory allocation
2017-10-17 12:10 [PATCH 0/3] PowerPC-OPAL: Adjustments for some function implementations SF Markus Elfring
@ 2017-10-17 12:11 ` SF Markus Elfring
2017-10-17 12:12 ` [PATCH 2/3] powerpc-opal: Improve 12 size determinations SF Markus Elfring
2017-10-17 12:14 ` [PATCH 3/3] powerpc-opal: Fix a typo in a comment line of two file headers SF Markus Elfring
2 siblings, 0 replies; 5+ messages in thread
From: SF Markus Elfring @ 2017-10-17 12:11 UTC (permalink / raw)
To: linuxppc-dev, Anju T Sudhakar, Benjamin Herrenschmidt,
Bhumika Goyal, Corentin Labbe, Hemant Kumar, Madhavan Srinivasan,
Mahesh Salgaonkar, Michael Ellerman, Michael Neuling,
Neelesh Gupta, Nicholas Piggin, Paul Mackerras, Rob Herring,
Shilpasri G Bhat, Stewart Smith, Tyrel Datwyler, Vasant Hegde
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 17 Oct 2017 12:21:40 +0200
Omit extra messages 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>
---
arch/powerpc/platforms/powernv/opal-async.c | 2 --
arch/powerpc/platforms/powernv/opal-dump.c | 1 -
arch/powerpc/platforms/powernv/opal-flash.c | 4 +---
arch/powerpc/platforms/powernv/opal-hmi.c | 5 ++---
.../powerpc/platforms/powernv/opal-memory-errors.c | 6 ++----
arch/powerpc/platforms/powernv/opal-sysparam.c | 25 +++++-----------------
6 files changed, 10 insertions(+), 33 deletions(-)
diff --git a/arch/powerpc/platforms/powernv/opal-async.c b/arch/powerpc/platforms/powernv/opal-async.c
index cf33769a7b72..2b11d8444b5a 100644
--- a/arch/powerpc/platforms/powernv/opal-async.c
+++ b/arch/powerpc/platforms/powernv/opal-async.c
@@ -193,8 +193,6 @@ int __init opal_async_comp_init(void)
sizeof(*opal_async_responses) * opal_max_async_tokens,
GFP_KERNEL);
if (!opal_async_responses) {
- pr_err("%s: Out of memory, failed to do asynchronous "
- "completion init\n", __func__);
err = -ENOMEM;
goto out_opal_node;
}
diff --git a/arch/powerpc/platforms/powernv/opal-dump.c b/arch/powerpc/platforms/powernv/opal-dump.c
index 4c827826c05e..b54864feef84 100644
--- a/arch/powerpc/platforms/powernv/opal-dump.c
+++ b/arch/powerpc/platforms/powernv/opal-dump.c
@@ -244,7 +244,6 @@ static int64_t dump_read_data(struct dump_obj *dump)
/* Allocate memory */
dump->buffer = vzalloc(PAGE_ALIGN(dump->size));
if (!dump->buffer) {
- pr_err("%s : Failed to allocate memory\n", __func__);
rc = -ENOMEM;
goto out;
}
diff --git a/arch/powerpc/platforms/powernv/opal-flash.c b/arch/powerpc/platforms/powernv/opal-flash.c
index 2fa3ac80cb4e..77d564266a59 100644
--- a/arch/powerpc/platforms/powernv/opal-flash.c
+++ b/arch/powerpc/platforms/powernv/opal-flash.c
@@ -437,10 +437,8 @@ static int alloc_image_buf(char *buffer, size_t count)
}
image_data.data = vzalloc(PAGE_ALIGN(image_data.size));
- if (!image_data.data) {
- pr_err("%s : Failed to allocate memory\n", __func__);
+ if (!image_data.data)
return -ENOMEM;
- }
/* Pin memory */
addr = image_data.data;
diff --git a/arch/powerpc/platforms/powernv/opal-hmi.c b/arch/powerpc/platforms/powernv/opal-hmi.c
index d78fed728cdf..b7dfe41a0a96 100644
--- a/arch/powerpc/platforms/powernv/opal-hmi.c
+++ b/arch/powerpc/platforms/powernv/opal-hmi.c
@@ -310,10 +310,9 @@ static int opal_handle_hmi_event(struct notifier_block *nb,
/* Delay the logging of HMI events to workqueue. */
msg_node = kzalloc(sizeof(*msg_node), GFP_ATOMIC);
- if (!msg_node) {
- pr_err("HMI: out of memory, Opal message event not handled\n");
+ if (!msg_node)
return -ENOMEM;
- }
+
memcpy(&msg_node->hmi_evt, hmi_evt, sizeof(struct OpalHMIEvent));
spin_lock_irqsave(&opal_hmi_evt_lock, flags);
diff --git a/arch/powerpc/platforms/powernv/opal-memory-errors.c b/arch/powerpc/platforms/powernv/opal-memory-errors.c
index 4495f428b500..8d76c05252d1 100644
--- a/arch/powerpc/platforms/powernv/opal-memory-errors.c
+++ b/arch/powerpc/platforms/powernv/opal-memory-errors.c
@@ -107,11 +107,9 @@ static int opal_memory_err_event(struct notifier_block *nb,
return 0;
msg_node = kzalloc(sizeof(*msg_node), GFP_ATOMIC);
- if (!msg_node) {
- pr_err("MEMORY_ERROR: out of memory, Opal message event not"
- "handled\n");
+ if (!msg_node)
return -ENOMEM;
- }
+
memcpy(&msg_node->msg, msg, sizeof(struct opal_msg));
spin_lock_irqsave(&opal_mem_err_lock, flags);
diff --git a/arch/powerpc/platforms/powernv/opal-sysparam.c b/arch/powerpc/platforms/powernv/opal-sysparam.c
index 23fb6647dced..1df05efe55a1 100644
--- a/arch/powerpc/platforms/powernv/opal-sysparam.c
+++ b/arch/powerpc/platforms/powernv/opal-sysparam.c
@@ -184,11 +184,8 @@ void __init opal_sys_param_init(void)
/* Allocate big enough buffer for any get/set transactions */
param_data_buf = kzalloc(MAX_PARAM_DATA_LEN, GFP_KERNEL);
- if (!param_data_buf) {
- pr_err("SYSPARAM: Failed to allocate memory for param data "
- "buf\n");
+ if (!param_data_buf)
goto out_kobj_put;
- }
/* Number of parameters exposed through DT */
count = of_property_count_strings(sysparam, "param-name");
@@ -199,25 +196,16 @@ void __init opal_sys_param_init(void)
}
id = kzalloc(sizeof(*id) * count, GFP_KERNEL);
- if (!id) {
- pr_err("SYSPARAM: Failed to allocate memory to read parameter "
- "id\n");
+ if (!id)
goto out_param_buf;
- }
size = kzalloc(sizeof(*size) * count, GFP_KERNEL);
- if (!size) {
- pr_err("SYSPARAM: Failed to allocate memory to read parameter "
- "size\n");
+ if (!size)
goto out_free_id;
- }
perm = kzalloc(sizeof(*perm) * count, GFP_KERNEL);
- if (!perm) {
- pr_err("SYSPARAM: Failed to allocate memory to read supported "
- "action on the parameter");
+ if (!perm)
goto out_free_size;
- }
if (of_property_read_u32_array(sysparam, "param-id", id, count)) {
pr_err("SYSPARAM: Missing property param-id in the DT\n");
@@ -236,11 +224,8 @@ void __init opal_sys_param_init(void)
}
attr = kzalloc(sizeof(*attr) * count, GFP_KERNEL);
- if (!attr) {
- pr_err("SYSPARAM: Failed to allocate memory for parameter "
- "attributes\n");
+ if (!attr)
goto out_free_perm;
- }
/* For each of the parameters, populate the parameter attributes */
for (i = 0; i < count; i++) {
--
2.14.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] powerpc-opal: Improve 12 size determinations
2017-10-17 12:10 [PATCH 0/3] PowerPC-OPAL: Adjustments for some function implementations SF Markus Elfring
2017-10-17 12:11 ` [PATCH 1/3] powerpc-opal: Delete ten error messages for a failed memory allocation SF Markus Elfring
@ 2017-10-17 12:12 ` SF Markus Elfring
2017-10-17 12:14 ` [PATCH 3/3] powerpc-opal: Fix a typo in a comment line of two file headers SF Markus Elfring
2 siblings, 0 replies; 5+ messages in thread
From: SF Markus Elfring @ 2017-10-17 12:12 UTC (permalink / raw)
To: linuxppc-dev, Anju T Sudhakar, Benjamin Herrenschmidt,
Bhumika Goyal, Corentin Labbe, Hemant Kumar, Madhavan Srinivasan,
Mahesh Salgaonkar, Michael Ellerman, Michael Neuling,
Neelesh Gupta, Nicholas Piggin, Paul Mackerras, Rob Herring,
Shilpasri G Bhat, Stewart Smith, Tyrel Datwyler, Vasant Hegde
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 17 Oct 2017 13:20:19 +0200
Replace the specification of data types by variable references
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
arch/powerpc/platforms/powernv/opal-flash.c | 4 ++--
arch/powerpc/platforms/powernv/opal-hmi.c | 2 +-
arch/powerpc/platforms/powernv/opal-imc.c | 10 +++++-----
arch/powerpc/platforms/powernv/opal-memory-errors.c | 2 +-
arch/powerpc/platforms/powernv/opal-psr.c | 2 +-
arch/powerpc/platforms/powernv/opal-sensor-groups.c | 4 ++--
arch/powerpc/platforms/powernv/opal-xscom.c | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/powerpc/platforms/powernv/opal-flash.c b/arch/powerpc/platforms/powernv/opal-flash.c
index 77d564266a59..9c6b54c86d71 100644
--- a/arch/powerpc/platforms/powernv/opal-flash.c
+++ b/arch/powerpc/platforms/powernv/opal-flash.c
@@ -418,12 +418,12 @@ static int alloc_image_buf(char *buffer, size_t count)
void *addr;
int size;
- if (count < sizeof(struct image_header_t)) {
+ if (count < sizeof(image_header)) {
pr_warn("FLASH: Invalid candidate image\n");
return -EINVAL;
}
- memcpy(&image_header, (void *)buffer, sizeof(struct image_header_t));
+ memcpy(&image_header, (void *)buffer, sizeof(image_header));
image_data.size = be32_to_cpu(image_header.size);
pr_debug("FLASH: Candidate image size = %u\n", image_data.size);
diff --git a/arch/powerpc/platforms/powernv/opal-hmi.c b/arch/powerpc/platforms/powernv/opal-hmi.c
index b7dfe41a0a96..92b1e12a7eed 100644
--- a/arch/powerpc/platforms/powernv/opal-hmi.c
+++ b/arch/powerpc/platforms/powernv/opal-hmi.c
@@ -313,7 +313,7 @@ static int opal_handle_hmi_event(struct notifier_block *nb,
if (!msg_node)
return -ENOMEM;
- memcpy(&msg_node->hmi_evt, hmi_evt, sizeof(struct OpalHMIEvent));
+ memcpy(&msg_node->hmi_evt, hmi_evt, sizeof(*hmi_evt));
spin_lock_irqsave(&opal_hmi_evt_lock, flags);
list_add(&msg_node->list, &opal_hmi_evt_list);
diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c
index 21f6531fae20..2302cfb953bd 100644
--- a/arch/powerpc/platforms/powernv/opal-imc.c
+++ b/arch/powerpc/platforms/powernv/opal-imc.c
@@ -38,11 +38,11 @@ static int imc_get_mem_addr_nest(struct device_node *node,
if (nr_chips <= 0)
return -ENODEV;
- base_addr_arr = kcalloc(nr_chips, sizeof(u64), GFP_KERNEL);
+ base_addr_arr = kcalloc(nr_chips, sizeof(*base_addr_arr), GFP_KERNEL);
if (!base_addr_arr)
return -ENOMEM;
- chipid_arr = kcalloc(nr_chips, sizeof(u32), GFP_KERNEL);
+ chipid_arr = kcalloc(nr_chips, sizeof(*chipid_arr), GFP_KERNEL);
if (!chipid_arr)
return -ENOMEM;
@@ -53,8 +53,8 @@ static int imc_get_mem_addr_nest(struct device_node *node,
nr_chips))
goto error;
- pmu_ptr->mem_info = kcalloc(nr_chips, sizeof(struct imc_mem_info),
- GFP_KERNEL);
+ pmu_ptr->mem_info = kcalloc(nr_chips, sizeof(*pmu_ptr->mem_info),
+ GFP_KERNEL);
if (!pmu_ptr->mem_info)
goto error;
@@ -88,7 +88,7 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain)
u32 offset;
/* memory for pmu */
- pmu_ptr = kzalloc(sizeof(struct imc_pmu), GFP_KERNEL);
+ pmu_ptr = kzalloc(sizeof(*pmu_ptr), GFP_KERNEL);
if (!pmu_ptr)
return -ENOMEM;
diff --git a/arch/powerpc/platforms/powernv/opal-memory-errors.c b/arch/powerpc/platforms/powernv/opal-memory-errors.c
index 8d76c05252d1..875e80ab96d9 100644
--- a/arch/powerpc/platforms/powernv/opal-memory-errors.c
+++ b/arch/powerpc/platforms/powernv/opal-memory-errors.c
@@ -110,7 +110,7 @@ static int opal_memory_err_event(struct notifier_block *nb,
if (!msg_node)
return -ENOMEM;
- memcpy(&msg_node->msg, msg, sizeof(struct opal_msg));
+ memcpy(&msg_node->msg, msg, sizeof(msg_node->msg));
spin_lock_irqsave(&opal_mem_err_lock, flags);
list_add(&msg_node->list, &opal_memory_err_list);
diff --git a/arch/powerpc/platforms/powernv/opal-psr.c b/arch/powerpc/platforms/powernv/opal-psr.c
index 7313b7fc9071..74986b35cf77 100644
--- a/arch/powerpc/platforms/powernv/opal-psr.c
+++ b/arch/powerpc/platforms/powernv/opal-psr.c
@@ -136,7 +136,7 @@ void __init opal_psr_init(void)
return;
}
- psr_attrs = kcalloc(of_get_child_count(psr), sizeof(struct psr_attr),
+ psr_attrs = kcalloc(of_get_child_count(psr), sizeof(*psr_attrs),
GFP_KERNEL);
if (!psr_attrs)
return;
diff --git a/arch/powerpc/platforms/powernv/opal-sensor-groups.c b/arch/powerpc/platforms/powernv/opal-sensor-groups.c
index 7e5a235ebf76..541c9ea04a32 100644
--- a/arch/powerpc/platforms/powernv/opal-sensor-groups.c
+++ b/arch/powerpc/platforms/powernv/opal-sensor-groups.c
@@ -166,13 +166,13 @@ void __init opal_sensor_groups_init(void)
if (!nr_attrs)
continue;
- sgs[i].sgattrs = kcalloc(nr_attrs, sizeof(struct sg_attr),
+ sgs[i].sgattrs = kcalloc(nr_attrs, sizeof(*sgs[i].sgattrs),
GFP_KERNEL);
if (!sgs[i].sgattrs)
goto out_sgs_sgattrs;
sgs[i].sg.attrs = kcalloc(nr_attrs + 1,
- sizeof(struct attribute *),
+ sizeof(*sgs[i].sg.attrs),
GFP_KERNEL);
if (!sgs[i].sg.attrs) {
diff --git a/arch/powerpc/platforms/powernv/opal-xscom.c b/arch/powerpc/platforms/powernv/opal-xscom.c
index 81c0a943dea9..22d5e1110dbb 100644
--- a/arch/powerpc/platforms/powernv/opal-xscom.c
+++ b/arch/powerpc/platforms/powernv/opal-xscom.c
@@ -46,7 +46,7 @@ static scom_map_t opal_scom_map(struct device_node *dev, u64 reg, u64 count)
__func__, dev);
return SCOM_MAP_INVALID;
}
- m = kmalloc(sizeof(struct opal_scom_map), GFP_KERNEL);
+ m = kmalloc(sizeof(*m), GFP_KERNEL);
if (!m)
return NULL;
m->chip = be32_to_cpup(gcid);
--
2.14.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] powerpc-opal: Fix a typo in a comment line of two file headers
2017-10-17 12:10 [PATCH 0/3] PowerPC-OPAL: Adjustments for some function implementations SF Markus Elfring
2017-10-17 12:11 ` [PATCH 1/3] powerpc-opal: Delete ten error messages for a failed memory allocation SF Markus Elfring
2017-10-17 12:12 ` [PATCH 2/3] powerpc-opal: Improve 12 size determinations SF Markus Elfring
@ 2017-10-17 12:14 ` SF Markus Elfring
2017-10-24 8:09 ` [3/3] " Michael Ellerman
2 siblings, 1 reply; 5+ messages in thread
From: SF Markus Elfring @ 2017-10-17 12:14 UTC (permalink / raw)
To: linuxppc-dev, Anju T Sudhakar, Benjamin Herrenschmidt,
Bhumika Goyal, Corentin Labbe, Hemant Kumar, Madhavan Srinivasan,
Mahesh Salgaonkar, Michael Ellerman, Michael Neuling,
Neelesh Gupta, Nicholas Piggin, Paul Mackerras, Rob Herring,
Shilpasri G Bhat, Stewart Smith, Tyrel Datwyler, Vasant Hegde
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 17 Oct 2017 13:31:42 +0200
Fix a word in these descriptions.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
arch/powerpc/platforms/powernv/opal-hmi.c | 2 +-
arch/powerpc/platforms/powernv/opal-memory-errors.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/powernv/opal-hmi.c b/arch/powerpc/platforms/powernv/opal-hmi.c
index 92b1e12a7eed..481a004b1b6d 100644
--- a/arch/powerpc/platforms/powernv/opal-hmi.c
+++ b/arch/powerpc/platforms/powernv/opal-hmi.c
@@ -1,5 +1,5 @@
/*
- * OPAL hypervisor Maintenance interrupt handling support in PowreNV.
+ * OPAL hypervisor Maintenance interrupt handling support in PowerNV.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/arch/powerpc/platforms/powernv/opal-memory-errors.c b/arch/powerpc/platforms/powernv/opal-memory-errors.c
index 875e80ab96d9..fd500b379560 100644
--- a/arch/powerpc/platforms/powernv/opal-memory-errors.c
+++ b/arch/powerpc/platforms/powernv/opal-memory-errors.c
@@ -1,5 +1,5 @@
/*
- * OPAL asynchronus Memory error handling support in PowreNV.
+ * OPAL asynchronus Memory error handling support in PowerNV.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
--
2.14.2
^ permalink raw reply related [flat|nested] 5+ messages in thread