From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761449AbdJQMNH (ORCPT ); Tue, 17 Oct 2017 08:13:07 -0400 Received: from mout.web.de ([212.227.15.4]:64601 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752077AbdJQMNF (ORCPT ); Tue, 17 Oct 2017 08:13:05 -0400 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 Cc: LKML , kernel-janitors@vger.kernel.org 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-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit 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= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); -- 2.14.2