From patchwork Sat Dec 16 13:54:03 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: 849531 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 3yzTXk1T6dz9t3F for ; Sun, 17 Dec 2017 01:03:18 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3yzTXk05M1zDsPm for ; Sun, 17 Dec 2017 01:03:18 +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.17.11; helo=mout.web.de; envelope-from=elfring@users.sourceforge.net; receiver=) Received: from mout.web.de (mout.web.de [212.227.17.11]) (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 3yzTTR27GfzDsP7 for ; Sun, 17 Dec 2017 01:00:26 +1100 (AEDT) Received: from [192.168.1.3] ([77.181.206.168]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Marpe-1ekdTs0pQo-00KQXW; Sat, 16 Dec 2017 14:54:10 +0100 Subject: [PATCH 2/2] ps3: Improve a size determination in five functions From: SF Markus Elfring To: linuxppc-dev@lists.ozlabs.org, Benjamin Herrenschmidt , Geoff Levand , Michael Ellerman , Paul Mackerras References: <9b6464bc-a408-de2a-1b54-cb7794b92506@users.sourceforge.net> Message-ID: <7aed1208-aa55-edb6-54be-f47fb1498bfd@users.sourceforge.net> Date: Sat, 16 Dec 2017 14:54:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <9b6464bc-a408-de2a-1b54-cb7794b92506@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:RlubFPTZQii7bcl59oXQ79BI7Ijwk5K5MU3GB6/X8CD/ocep1OV Ws1C7T/pED4jxjrgvoI6kdCI8iBVDV3RAzaRX2x/jxMSTwcDHA1wGjdWX10ZYhXD7wIfkgq utx75q0fO6Iw5dOdObFwNb02LNWqqhwHsnv52sHPv28vg3mUM/N6/DKE8eH16gYBHeR1/n0 k4QEpjkCSPvrzwH43+xOg== X-UI-Out-Filterresults: notjunk:1; V01:K0:QhfqPbc6lGo=:zYv5PctV6uj29RvttN94aq IyeU4vaClBplVwHtzf19kdKHIR9lvFHv1R9u1YqQ6pzWlZ+xb43/SuNeplYV306j60AHm/gBA a/p5Aj7YOcv+9m3hVgneciU8o5oR1f5aoXTwEnIQmz+VDeYAGigPN6mIN6FV/vZwm1JRDm0Zk LHlHV9mclJSM+hNxNboiVChw3YyhLzb2z5WZcZKuKuGgQ54fD28lZ/spHe6r9IKLdvmtT+wY5 U6YIS8giTvJsqepDrFB90+zLyI4RSgPcyKe0EvoVDplkb4LClRd3KqKhP/D3+80P3y1LWETbw RKe4UxEIn6rixv7sBhpZyHQAcXQ70WHhG+aQVi57S3XfpDovO4z1FQSysA49mr44LAkOU7MYi ZwlUSsQuDyi2l46A11ueM7tcQsVqTHi1nTQYlXLdm8IsCf+bXrmGuzjj2/Kq+tWfNgw4/ZwN2 9+wCDVABCXB0rwIWnxfqtwrN6YjeeVp+GDi0Fs9iItl7Dut68vn2SIz2KEppa8wAWkzAXM3Le diVkCaAPAbUafsTgS6N6OvNwiWeLvI1v5HWlNn7+42D21RQPco6Cbm/XrbLDN/01J2N81+/BB DqZnV2LGDmrx59LoWrBmUSl5fP7o3iI93sKh487KwaVokNLyQFhRNj/zkW13cnW+Ndet0O223 r02JfN6EAA5AgqGuhd6t3yRYXUO89IyYIypDDBe0LuqwIRF4RHQ4W4qEFN6+/hXAhnIeLQFNf myNrQPVRq6rhO+vda437ZCv4DJyEXwpc1wQVMeQ3X0C7suECITCvEpndGmjWMAXYsFoXNoZYz jsz9hTiriI44a5otuN8O8LWJs9xgR8dKcMQHo52DkY4GXU6kAU= 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: Sat, 16 Dec 2017 14:21:04 +0100 Replace the specification of data structures 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 --- drivers/ps3/ps3-sys-manager.c | 9 ++------- drivers/ps3/ps3-vuart.c | 11 +++-------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/ps3/ps3-sys-manager.c b/drivers/ps3/ps3-sys-manager.c index 73e496a72113..e7d8ef93576a 100644 --- a/drivers/ps3/ps3-sys-manager.c +++ b/drivers/ps3/ps3-sys-manager.c @@ -249,9 +249,7 @@ static int ps3_sys_manager_write(struct ps3_system_bus_device *dev, BUG_ON(header->payload_size != 8 && header->payload_size != 16); BUG_ON(header->service_id > 8); - result = ps3_vuart_write(dev, header, - sizeof(struct ps3_sys_manager_header)); - + result = ps3_vuart_write(dev, header, sizeof(*header)); if (!result) result = ps3_vuart_write(dev, payload, header->payload_size); @@ -537,11 +535,8 @@ static int ps3_sys_manager_handle_cmd(struct ps3_system_bus_device *dev) static int ps3_sys_manager_handle_msg(struct ps3_system_bus_device *dev) { - int result; struct ps3_sys_manager_header header; - - result = ps3_vuart_read(dev, &header, - sizeof(struct ps3_sys_manager_header)); + int result = ps3_vuart_read(dev, &header, sizeof(header)); if (result) return result; diff --git a/drivers/ps3/ps3-vuart.c b/drivers/ps3/ps3-vuart.c index bbaad30a876f..c82362cbaf4a 100644 --- a/drivers/ps3/ps3-vuart.c +++ b/drivers/ps3/ps3-vuart.c @@ -522,8 +522,7 @@ int ps3_vuart_write(struct ps3_system_bus_device *dev, const void *buf, } else spin_unlock_irqrestore(&priv->tx_list.lock, flags); - lb = kmalloc(sizeof(struct list_buffer) + bytes, GFP_KERNEL); - + lb = kmalloc(sizeof(*lb) + bytes, GFP_KERNEL); if (!lb) return -ENOMEM; @@ -575,9 +574,7 @@ static int ps3_vuart_queue_rx_bytes(struct ps3_system_bus_device *dev, /* Add some extra space for recently arrived data. */ bytes += 128; - - lb = kmalloc(sizeof(struct list_buffer) + bytes, GFP_ATOMIC); - + lb = kmalloc(sizeof(*lb) + bytes, GFP_ATOMIC); if (!lb) return -ENOMEM; @@ -925,9 +922,7 @@ static int ps3_vuart_bus_interrupt_get(void) return 0; BUG_ON(vuart_bus_priv.bmp); - - vuart_bus_priv.bmp = kzalloc(sizeof(struct ports_bmp), GFP_KERNEL); - + vuart_bus_priv.bmp = kzalloc(sizeof(*vuart_bus_priv.bmp), GFP_KERNEL); if (!vuart_bus_priv.bmp) { result = -ENOMEM; goto fail_bmp_malloc;