From patchwork Tue Oct 17 12:11:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 826926 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yGYzj4Qryz9sPr for ; Tue, 17 Oct 2017 23:15:13 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3yGYzj3HMQzDrJm for ; Tue, 17 Oct 2017 23:15:13 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=users.sourceforge.net (client-ip=212.227.15.3; helo=mout.web.de; envelope-from=elfring@users.sourceforge.net; receiver=) Received: from mout.web.de (mout.web.de [212.227.15.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3yGYwD39NlzDrGy for ; Tue, 17 Oct 2017 23:12:11 +1100 (AEDT) Received: from [192.168.1.2] ([92.228.183.125]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MH2Fm-1e0Wij2p62-00Dohg; Tue, 17 Oct 2017 14:11:51 +0200 Subject: [PATCH 1/3] powerpc-opal: Delete ten error messages for a failed memory allocation From: SF Markus Elfring To: linuxppc-dev@lists.ozlabs.org, 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 References: <5fb4f314-cd23-c439-ab13-96b8188070e0@users.sourceforge.net> Message-ID: Date: Tue, 17 Oct 2017 14:11:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <5fb4f314-cd23-c439-ab13-96b8188070e0@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:7o7u/SzQY+0qDKKcf/kp7F4IfGTKhTrX0a5OshiNIWVkWkicN8X s2Y0Z6upTtg8/GJDxQXTBRLjuJvdsDnnuZXbIen6AZJHWbURAPx/7GnSjzQ6XTuBY/xOC9v uwt5fkeTDSjGyZQbsk5eYO+KE/Ghm9NSyeC+oUL4Km0oUiNhcx8wO6cY28b2vVwJUh1ZXd1 apWjnZQCHTNoHh2+YdqQw== X-UI-Out-Filterresults: notjunk:1; V01:K0:RGpTEVd183E=:wI3ipxoEViso7+GUUoQ2Es 1VeH0K5Jvyqp37yx1CNAotxIYUpmplNVxSaiCm2i7vefZzOwbW01gzXv0tDMGkzsWMLBTsUwt 8chUHUYNVuRSH9mOmVYdj/KyH9TTFV4RQC//gU0bkw49CXMnLCHM+Ioicq7XrqcjKJwZesBEA yDHFE8OXtNfY9GT2SNtcvPx96hr4ZL9EG/TG22IRj83WetksDLumXXP3uGXElZYJIDrX7cpCw gXwhZujB3GDCXl0iHuSM5IcmfESYPlp0zzEi63vOPAfhPmpwpGZE+N4k5En142/6q9jRX1c8Z QV2ArwjR6Ozs3tMu37kM/OwZ/N6SNZ4lO8GMrBfTFNnF7y2ySngYQA0YGGjGoO5JD/jIkRK+N ttR70CH/EQDuM0opYAthdN8GAKkupzz20EaqEgvQx8Jwb/FqjuBQ0kCI/JLaMY79rqImOQR+I i2DlA+OdzuyCSZAz8JW9ttdHvpq2T/5gzdXoAabpFDYpMXK5W8RF/OursTukYQYvtEHqgze/l mzjK5kFw52h12y+dTl6cTfDUx7ZsXXnKzbx9XZ33Q8t4gFy1d/+ZUYBUvXrdc47QARLBdcEeT oANaFQOHGt0t+NQs2EKnHcvENIBDjV/1kKujSPewEu9UySPYv4bK8z8TAgKZ7fAEFRd89Qudd Le0m8EV//V9omlvNCsg3GNwLcb/W/0nATvJMO6ZDSENE82qddqPowC0v9qgmS54rNlaCJrpIB EI7WnKBbdaPrmeXgjoP4Fd2jK29pV0FBsOPe6LWzYi3z9nCSmYhsJRGYbRIa2ZHjUaNeoa5dC 1l4IGQmlB8IcAA5WF/P3lT28KFp6sLKCc3gV2GtHmMDV6yaE8M= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring 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 --- 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++) { From patchwork Tue Oct 17 12:12:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 826927 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yGZ1G60Qqz9s9Y for ; Tue, 17 Oct 2017 23:16:34 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3yGZ1G52RbzDrSh for ; Tue, 17 Oct 2017 23:16:34 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=users.sourceforge.net (client-ip=212.227.15.4; helo=mout.web.de; envelope-from=elfring@users.sourceforge.net; receiver=) Received: from mout.web.de (mout.web.de [212.227.15.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3yGYxR2FVVzDrKk for ; Tue, 17 Oct 2017 23:13:14 +1100 (AEDT) Received: from [192.168.1.2] ([92.228.183.125]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MFt3u-1dzQoI1aFC-00Essd; Tue, 17 Oct 2017 14:12:56 +0200 Subject: [PATCH 2/3] powerpc-opal: Improve 12 size determinations From: SF Markus Elfring To: linuxppc-dev@lists.ozlabs.org, 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 References: <5fb4f314-cd23-c439-ab13-96b8188070e0@users.sourceforge.net> Message-ID: Date: Tue, 17 Oct 2017 14:12:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <5fb4f314-cd23-c439-ab13-96b8188070e0@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:hwnGTAJ184qcv4Dytd9ODLfy7aSCkOfceT78wD1kmVBa5wkKePU JCRXCIKhaEhrRYM6imELmUCufCAP1tmZak1cIEReyyvOB5wf5hiBb7M3tMpZB6lB/UuMYtJ 7Lhytm8c/11gcViGPBlEbslmLu+n5PbAqUguI44zc3CTNuW0jCHWJPH+nHMVpW6/ipwyXHo 0xqbV4MGSEaPq9TQVHO4g== X-UI-Out-Filterresults: notjunk:1; V01:K0:ZHB2mcPPw+0=:DS05BOhfD6z2AleEWmOF4z NIJ7+qtTTGHS6jepl4Y1zT2MKz56ngsUQH7U+wm6PP6R5S+enSO/7ULkfRCuckt6QH8yOBOKV v2S5y+rYobOx7VJP/btyfHcTqruSwKpeT982YdFM6PekMEWj5nqcpAPXGGV4D/BD1UYdICLyc gjIergBzzUDhSTHqEtyjrWnhexXVaLvumLiAA0alT6EacLEOX3YsuUkekvaOTw19r8u+1FPik c0NZPzcAWQxI8bA4pfygEtJsMUmCBiaOqLjQhzg0w/O+2C133pxdDcORvgYuf7Ku8ctd+lbXZ 4S5uuOLdLZHJlePgiilIk6XbxUttY3kbbkkzazcZ91h5CWGLinFwFGYA4Rz2xmdluvDw4o9yV AUF6EDiv8OwLHQmbxuP93jFMXizmWsMfANRVOVG5epgBQ4jKCAkUiAD7zDUCtS9k+ajUja2ON oDILturuWRaAnAr3Z76z9w1WdQLQX3XSjG/7mOsnHAcrhzv7IZPcTvw28llIIvbxvnonh6O7q TuA5rm7uShtX7KJbEHtjV2rqpjszXO9eicm9jwvof3BuiMNwaWr05iZcrTOKFRJ4wFzMBzUOJ 67yo44zzhKYzrM7rWC6KLZH8pmEV1pfs2uBALfMEULs2WNRO94d6SB0PcfBPcxcDLuAqKEWsr NBz5YgFAzWfZ8fsCsR/qWYqiMX6JkmkNWL3dwt0fPD2czulD2AA3hUICg1DmhB3S9j3uSZk1i gEen0yOv/QdE1mbEuZveygMHNtJS9oS4FTfDfihywqvc1sXNIhZz8G4DIyVO9lGdAzMkVBNuS mK6UDzlsX4sIvU34XseDKhre9bO2c07YiV13fNBsLmIjeMs8K0= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring 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 --- 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); From patchwork Tue Oct 17 12:14:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 826928 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yGZ2r3N92z9s9Y for ; Tue, 17 Oct 2017 23:17:56 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3yGZ2r2BqQzDrV4 for ; Tue, 17 Oct 2017 23:17:56 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=users.sourceforge.net (client-ip=212.227.15.3; helo=mout.web.de; envelope-from=elfring@users.sourceforge.net; receiver=) Received: from mout.web.de (mout.web.de [212.227.15.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3yGYyv4lMszDrGD for ; Tue, 17 Oct 2017 23:14:31 +1100 (AEDT) Received: from [192.168.1.2] ([92.228.183.125]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LgpIE-1dQ5oC2Cda-00oEVC; Tue, 17 Oct 2017 14:14:02 +0200 Subject: [PATCH 3/3] powerpc-opal: Fix a typo in a comment line of two file headers From: SF Markus Elfring To: linuxppc-dev@lists.ozlabs.org, 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 References: <5fb4f314-cd23-c439-ab13-96b8188070e0@users.sourceforge.net> Message-ID: <57c47bff-63a2-62c1-2708-c351c2182304@users.sourceforge.net> Date: Tue, 17 Oct 2017 14:14:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <5fb4f314-cd23-c439-ab13-96b8188070e0@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:wvPNvRwrq71/grF/4/gqAKtahtW9okutaSEQxzliuIcXM7W1wEs bk6l6G85OLLAM7RyULz3Kz+EEoEj2kQPtEKmGWua090v0jB8XRP/zm91S0jAfw2f7JpWrk+ amMX7LIYEeBKdMumsT+jaC3y8tti2fZSGzx1f3YwegYWSSCrFj1OQ8E/XrTEbSP0ZqQ5m/h AFgK6zepMSnYvDtniYicA== X-UI-Out-Filterresults: notjunk:1; V01:K0:PV9WHnmC//o=:mQhnOgx0kMJEnZOWmszNNa XGcxUdnlqvBdMSHucMAqIzNxToXZOxI0aXgXiatkV7s3bJTsYOfIEBos7UBBI/1vUwVWAKH/R 8i6ixn77PM1ZhJ0NcU+70LWVA+hWrnpP2m7++NuYToLjWuLqJVFXLs2aQkZiB0JO0xmVUpu+5 TUfrwJ4/jpu6D8thPpr0YMQFpJBr2o7NDgwyJU7Pk0aoUjNqegZMEti8U5hVF8+uAG015GDSN BC+0orFqyri8DyozewPgif1x+0XQeZP3Ooku393fZxKGec/bd32zRXcOXvxWKtqzwfnYNfxAm HtJ+A2hxYBiz2mgMi9axZNPUgfMOfUYZo0kTZLSYc/8PilUf2d8tYp5YuAsxFa9HPRXiU0hCD KlElz9T1VJW1zuWC2PIeCTtKjXB4TRZ4b26G2uxAfpj+EzKXAzTbP9Qe0xTQ1qjtctGVR4i/V v2euA880Ivek5IEgrmiu4oRUm6zNr6zypSjrGG/4YOE21iT8/anOF8t6Cq+NMP8yPnYpprBNw DXa8APIbxq5v3epgv0PL8V0TtLvGvGiYnRHA0XudKjjHlG1wt8Z2XkMpfhYrZw+JKTOSo9MId uGsyWwK9Xi9ouj5inLUv1Mt4O1tkJknL5v95QblQO53Yg4U/JMpRowJg8uIQDpUSS/0ATpq2E onVnC8xbZpHBZ16vJstsqLZnqTLt0RVZ9LNPKhI89pFCle3BF+eOEs2sEJX/GizJsVBSVtZBs WqcmZKVnXSw69YplwCpo2tgKpeaWIXbv0/xnxIiYxzKg3qchySnl58SpjksLO7MfCtNznJ2GU VJgdv03Zdpn07DgWBGee4VL8U2VOZNMDaIYQWO0pvd+6/L16yE= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Tue, 17 Oct 2017 13:31:42 +0200 Fix a word in these descriptions. Signed-off-by: Markus Elfring --- 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