From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754520AbdEIOXf (ORCPT ); Tue, 9 May 2017 10:23:35 -0400 Received: from mout.web.de ([212.227.17.11]:62552 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754147AbdEIOXb (ORCPT ); Tue, 9 May 2017 10:23:31 -0400 Subject: [PATCH 2/4] hamradio: Adjust four function calls together with a variable assignment From: SF Markus Elfring To: linux-hams@vger.kernel.org, netdev@vger.kernel.org, "David S. Miller" , Javier Martinez Canillas , Jean-Paul Roubelat Cc: LKML , kernel-janitors@vger.kernel.org References: <4c5c939a-bd55-7b88-8e41-49f5544b7658@users.sourceforge.net> Message-ID: <28005de5-baf6-9db0-7eaa-7ef14d4e7142@users.sourceforge.net> Date: Tue, 9 May 2017 16:23:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1 MIME-Version: 1.0 In-Reply-To: <4c5c939a-bd55-7b88-8e41-49f5544b7658@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:/ZiOMq74XbT9gbXQFxVX1BENw4+qUzMqMkuj2BmISm6gwUtVjai YlhA5G8XjqhihKTpAwyFDDyzlwGN4OoQRq7/J7ggYxIUM2nySApRcPDG5Lcr+k0qdqCMZOv cVOAWy7zjpf+6oB4hWonHIT1IaACI5aYlNnsXdLdO8u/ugcFcnNBF8kIN/x3++OB+PaMhmI nZ0ai7PtnKyo+x6evR0Dw== X-UI-Out-Filterresults: notjunk:1;V01:K0:4FZq4IjxqwY=:0qBFzmqBdS3DGIHfgEuYOM 31tEC6lmlcYRMP0e4N6ASCMRUwkN5pKmih0oquzoOWtPYC/vMMuHkdYQ1RXRtew7V9L7f+u9n LOXQ7sUcTjgs0c0BO+K4F2g6o2Oea/qEqSsMQaTfUOqBfloTtoXLBFSMk9HqSyjVJFNU5JA5y 6/CH1kQ3lsVE9i5J8NQDKJaog4p58bfs8WWQjyfeWT8yCXuhAEMaUTuJyuGndR8gnJPsdPH6v SZNUSJWQyBwbzjPE7N+9PoTfpnBHq/EiQRFni8X/65bLKh/YhHshgXp8sf/u+K5CUAElNX34A n1gx5e1jDWuy1w1I3Ux6My0te5ZrbU3HbFQG29qriRY/mfBJ6fdTw8jvReHk59C6TfAEHxF3p njUReR82/QPl2Gqn9wlZnzcT+Mcxe9EQ+b2bLGi7JxNsvTaFW3u4ePseYlPg53yLpT84j34tx pBfUHqKUJoEEdbiDwNXCGpCB2bzD3hjsHCO2rHdDhYrPv2vL14i/aFEI9Qiutwnq2gdZs8iEo RD3vSzcCavILHCGCmhCApJFVw+d2900qwK0nxNDv8LCWU7lF+X3Axara8aPo+nD7OsuAH/Ngz vhW/uJeA24EMatC7BR7Is4H23rzZA5SphmPIHM2mI0MJn8TFKBwEPneh287Bo59z+utIQFbER rQYmd8EjXTRy/UZLlRQkCMndNGaIxioUrripDJfYt1clgwZEveozjwSvaPhG0+rKv0JkLNHX7 qnpzjEWrlS/JAZ4kd/WCb37lQaF/kQztWnm/oeJGZRon/OVl0FXdSAxr6NV3wfGct9A7fwDPk HO63ZxL Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 9 May 2017 15:15:16 +0200 The script "checkpatch.pl" pointed information out like the following. ERROR: do not use assignment in if condition Thus fix affected source code places. Improve a size determination. Signed-off-by: Markus Elfring --- drivers/net/hamradio/yam.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 542f1e511df1..c792b0f116a5 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c @@ -401,7 +401,8 @@ static unsigned char *add_mcs(unsigned char *bits, int bitrate, } /* Allocate a new mcs */ - if ((p = kmalloc(sizeof(struct yam_mcs), GFP_KERNEL)) == NULL) { + p = kmalloc(sizeof(*p), GFP_KERNEL); + if (!p) { release_firmware(fw); return NULL; } @@ -549,7 +550,8 @@ static inline void yam_rx_flag(struct net_device *dev, struct yam_port *yp) if ((yp->rx_crch & yp->rx_crcl) != 0xFF) { /* Bad crc */ } else { - if (!(skb = dev_alloc_skb(pkt_len))) { + skb = dev_alloc_skb(pkt_len); + if (!skb) { printk(KERN_WARNING "%s: memory squeeze, dropping packet\n", dev->name); ++dev->stats.rx_dropped; } else { @@ -670,7 +672,8 @@ static void yam_tx_byte(struct net_device *dev, struct yam_port *yp) break; case TX_HEAD: if (--yp->tx_count <= 0) { - if (!(skb = skb_dequeue(&yp->send_queue))) { + skb = skb_dequeue(&yp->send_queue); + if (!skb) { ptt_off(dev); yp->tx_state = TX_OFF; break; @@ -879,7 +882,8 @@ static int yam_open(struct net_device *dev) printk(KERN_ERR "%s: cannot 0x%lx busy\n", dev->name, dev->base_addr); return -EACCES; } - if ((u = yam_check_uart(dev->base_addr)) == c_uart_unknown) { + u = yam_check_uart(dev->base_addr); + if (u == c_uart_unknown) { printk(KERN_ERR "%s: cannot find uart type\n", dev->name); ret = -EIO; goto out_release_base; -- 2.12.2