From patchwork Thu Jun 25 15:36:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 1316999 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=OMVoJg1t; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49t3yl2tWRz9sRf for ; Fri, 26 Jun 2020 01:36:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405844AbgFYPg1 (ORCPT ); Thu, 25 Jun 2020 11:36:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405394AbgFYPg0 (ORCPT ); Thu, 25 Jun 2020 11:36:26 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 888CBC08C5C1; Thu, 25 Jun 2020 08:36:26 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id i4so3405027pjd.0; Thu, 25 Jun 2020 08:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y3kkWJ/JOzzDXyxNZr6XcUI/1J7xSry3mHpwhIQzL+E=; b=OMVoJg1tPn70JBLaclMof0/+Dc7ez6g+JlgUw2qkgyFZprwMTXR96TOGPWXMLf1iTc qNPxlfS6d/2f0VA+ob9zAbZeyRBcRe3YGZ3pCRYTJqeYrGj9uU2SWnmd2UC9eYLeOmoU wP8E6ECohKGe61Ct78Xm6xD8+wqiWKprtxWFvDjIol2lWrh6v+0syC0Rm05WqPXTXym6 T2k8dONjQjXQe5IyDlRNBh6huh42wiiXtt4C+2/66o/yvnsYsVp4vUhHXLSVeZcaT0U9 tFYhhABhzFzefIM934Erz3dlwdn5Ct3EDsrVY4yBV8Lz4zDisKpk1zLPvn98noofsij9 hezw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y3kkWJ/JOzzDXyxNZr6XcUI/1J7xSry3mHpwhIQzL+E=; b=FPVV+2MdwxrolNTzkkvwoxxZeLhSCZ8tBLVwZ8B3KyJOF8Kw4MDEZcRH65FWgPv4uq g+e2+lxFQCj89WYEsea8ULD38ue49upYnrArvNR/Wvlh59agFxIK/c30lpxEOGA0B3nc GQdeefTiDqREvdaDw5JA247lccbxfkGZ8HYqRm+xtS9jMa6ZWB4O77ihaokDl0BB0tMx hu0rSBDefTo3V5nlhRdolHZRUw/9MN3FmC6zwbctCmyUQu84wHttKL8YOzrwdRNw7Wul qMr/FcEbiFqZY62aBKBtLTRQEEE1mcFNHTh2sXRDCacPMA3r38V15/9u+PZce5F8RUnb cyng== X-Gm-Message-State: AOAM533otpiWOtoBMtITsvEVmeUVz4XWUyHbA6V26mgZNXTKDf+ekTkx Pk0YCdfabseTobJw1hepCto= X-Google-Smtp-Source: ABdhPJwFb0pWt9Rj/wa4mbgHdYQwaBWsYomXSN7c8EZ8E45HhDdKTr397uSuflAWFZM9ti4g8cageg== X-Received: by 2002:a17:90a:1b69:: with SMTP id q96mr4072875pjq.198.1593099386081; Thu, 25 Jun 2020 08:36:26 -0700 (PDT) Received: from localhost ([2001:e42:102:1532:160:16:113:140]) by smtp.gmail.com with ESMTPSA id f6sm25413406pfe.174.2020.06.25.08.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 08:36:25 -0700 (PDT) From: Coiby Xu To: devel@driverdev.osuosl.org Cc: Manish Chopra , GR-Linux-NIC-Dev@marvell.com (supporter:QLOGIC QLGE 10Gb ETHERNET DRIVER), Greg Kroah-Hartman , netdev@vger.kernel.org (open list:QLOGIC QLGE 10Gb ETHERNET DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] fix trailing */ in block comment Date: Thu, 25 Jun 2020 23:36:13 +0800 Message-Id: <20200625153614.63912-2-coiby.xu@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625153614.63912-1-coiby.xu@gmail.com> References: <20200625153614.63912-1-coiby.xu@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Coiby Xu --- drivers/staging/qlge/qlge_main.c | 3 ++- drivers/staging/qlge/qlge_mpi.c | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c index 1650de13842f..aaecf2b0f9a1 100644 --- a/drivers/staging/qlge/qlge_main.c +++ b/drivers/staging/qlge/qlge_main.c @@ -3244,7 +3244,8 @@ static void ql_set_irq_mask(struct ql_adapter *qdev, struct intr_context *ctx) */ ctx->irq_mask = (1 << qdev->rx_ring[vect].cq_id); /* Add the TX ring(s) serviced by this vector - * to the mask. */ + * to the mask. + */ for (j = 0; j < tx_rings_per_vector; j++) { ctx->irq_mask |= (1 << qdev->rx_ring[qdev->rss_ring_count + diff --git a/drivers/staging/qlge/qlge_mpi.c b/drivers/staging/qlge/qlge_mpi.c index 60c08d9cc034..3bb08d290525 100644 --- a/drivers/staging/qlge/qlge_mpi.c +++ b/drivers/staging/qlge/qlge_mpi.c @@ -389,7 +389,8 @@ static void ql_init_fw_done(struct ql_adapter *qdev, struct mbox_params *mbcp) * This can get called iteratively from the mpi_work thread * when events arrive via an interrupt. * It also gets called when a mailbox command is polling for - * it's completion. */ + * it's completion. + */ static int ql_mpi_handler(struct ql_adapter *qdev, struct mbox_params *mbcp) { int status; @@ -520,7 +521,7 @@ static int ql_mpi_handler(struct ql_adapter *qdev, struct mbox_params *mbcp) * changed when a mailbox command is waiting * for a response and an AEN arrives and * is handled. - * */ + */ mbcp->out_count = orig_count; return status; } @@ -555,7 +556,8 @@ static int ql_mailbox_command(struct ql_adapter *qdev, struct mbox_params *mbcp) * here because some AEN might arrive while * we're waiting for the mailbox command to * complete. If more than 5 seconds expire we can - * assume something is wrong. */ + * assume something is wrong. + */ count = jiffies + HZ * MAILBOX_TIMEOUT; do { /* Wait for the interrupt to come in. */ @@ -1178,7 +1180,7 @@ void ql_mpi_idc_work(struct work_struct *work) /* Signal the resulting link up AEN * that the frame routing and mac addr * needs to be set. - * */ + */ set_bit(QL_CAM_RT_SET, &qdev->flags); /* Do ACK if required */ if (timeout) { From patchwork Thu Jun 25 15:36:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 1317000 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=J1WlZPcM; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49t3yp2P9tz9sRf for ; Fri, 26 Jun 2020 01:36:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405862AbgFYPgd (ORCPT ); Thu, 25 Jun 2020 11:36:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405394AbgFYPgb (ORCPT ); Thu, 25 Jun 2020 11:36:31 -0400 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AC28C08C5C1; Thu, 25 Jun 2020 08:36:31 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id y18so2952164plr.4; Thu, 25 Jun 2020 08:36:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bfgtGWX8ohA5pb3Ut9fGEq9lHt//ieN4999zfH1Y6xI=; b=J1WlZPcM5orSXpO4GBcx0CmYGNuymyvCL/1z3f83e4BW4ram7LvutZyEXm+Iy1cQM1 VvCjCd878vAnRR3fGTOXkgsu1PbsX7YqSgOjv74pnRMUQ9fTcvpOSAaC174fFu0n0nHL dyY4CrWHgIiZ1qQwt9fAODCBGxWR5YgbWJHFqpZW5iEyDxPNwouEcrRCNBg/5yF4Gbff 8YO+mCDxVboUKrMXb9L7+rugUqo9oAJ20qyYnxHHOuqdx+n1iK8qgtqDYxIC9TV/Z03E D8WlgtuNoBuDkbYhlcte4yWKajrtF8+kkwreQ/beXjuJ2W7tzKd3wKa51SgvIhPeITNu 6azw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bfgtGWX8ohA5pb3Ut9fGEq9lHt//ieN4999zfH1Y6xI=; b=HkzJ8fFcrp4HH8GIJv8357o0gK1DVY0TlAM/YqWDIBpTkGqFbFfChWVLG1T/v6yWgg ByDImrAL//r4EWPQhM06i4R6FIBqt4nmfPW7X/x4ZJh9ZI3jNGcv0SJFk0GUojTPQZWA BaTRqWma4OVmM2r5sIUgaXmtQdTHThVzjxplgcNRc1fHejSE2gHk3gYc3dMC4/Yy2kC1 Ft3CUlUHPTnT4wdegbADMNEr/v1HdUECm8Apr0mBUvxQ5b5slLKwkYBFxXDmn0CYa/UK sUEHvZRxPqvXKKptL49H3cEN/8cQHZWccpAZ2rU46T+QttSPAQHDznuhZGwVENlnUARp tchQ== X-Gm-Message-State: AOAM533s8F3zlCDtAuTgt8YUKd1eUH2InmyZYSk8yS3cAO17iNwepGkR vbUQ7uFpgV+UAxsvAiI/wj0= X-Google-Smtp-Source: ABdhPJwFDKRrMmvG2CAiFZdg1UXxnMVF4PE0N9I3xhhWBAXIJrAy/vYCGSeciWyS/jr6QqegIx1LDg== X-Received: by 2002:a17:90a:a47:: with SMTP id o65mr4129035pjo.70.1593099390950; Thu, 25 Jun 2020 08:36:30 -0700 (PDT) Received: from localhost ([2001:e42:102:1532:160:16:113:140]) by smtp.gmail.com with ESMTPSA id i20sm24174151pfd.81.2020.06.25.08.36.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 08:36:30 -0700 (PDT) From: Coiby Xu To: devel@driverdev.osuosl.org Cc: Manish Chopra , GR-Linux-NIC-Dev@marvell.com (supporter:QLOGIC QLGE 10Gb ETHERNET DRIVER), Greg Kroah-Hartman , netdev@vger.kernel.org (open list:QLOGIC QLGE 10Gb ETHERNET DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] fix else after return or break Date: Thu, 25 Jun 2020 23:36:14 +0800 Message-Id: <20200625153614.63912-3-coiby.xu@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625153614.63912-1-coiby.xu@gmail.com> References: <20200625153614.63912-1-coiby.xu@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Coiby Xu --- drivers/staging/qlge/qlge_dbg.c | 23 ++++++++++------------- drivers/staging/qlge/qlge_main.c | 8 ++++---- drivers/staging/qlge/qlge_mpi.c | 4 ++-- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/drivers/staging/qlge/qlge_dbg.c b/drivers/staging/qlge/qlge_dbg.c index 058889687907..87433510a224 100644 --- a/drivers/staging/qlge/qlge_dbg.c +++ b/drivers/staging/qlge/qlge_dbg.c @@ -1391,12 +1391,11 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev) pr_err("%s: Failed read of mac index register\n", __func__); return; - } else { - if (value[0]) - pr_err("%s: CAM index %d CAM Lookup Lower = 0x%.08x:%.08x, Output = 0x%.08x\n", - qdev->ndev->name, i, value[1], value[0], - value[2]); } + if (value[0]) + pr_err("%s: CAM index %d CAM Lookup Lower = 0x%.08x:%.08x, Output = 0x%.08x\n", + qdev->ndev->name, i, value[1], value[0], + value[2]); } for (i = 0; i < 32; i++) { if (ql_get_mac_addr_reg @@ -1404,11 +1403,10 @@ static void ql_dump_cam_entries(struct ql_adapter *qdev) pr_err("%s: Failed read of mac index register\n", __func__); return; - } else { - if (value[0]) - pr_err("%s: MCAST index %d CAM Lookup Lower = 0x%.08x:%.08x\n", - qdev->ndev->name, i, value[1], value[0]); } + if (value[0]) + pr_err("%s: MCAST index %d CAM Lookup Lower = 0x%.08x:%.08x\n", + qdev->ndev->name, i, value[1], value[0]); } ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK); } @@ -1427,11 +1425,10 @@ void ql_dump_routing_entries(struct ql_adapter *qdev) pr_err("%s: Failed read of routing index register\n", __func__); return; - } else { - if (value) - pr_err("%s: Routing Mask %d = 0x%.08x\n", - qdev->ndev->name, i, value); } + if (value) + pr_err("%s: Routing Mask %d = 0x%.08x\n", + qdev->ndev->name, i, value); } ql_sem_unlock(qdev, SEM_RT_IDX_MASK); } diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c index aaecf2b0f9a1..0054c454506b 100644 --- a/drivers/staging/qlge/qlge_main.c +++ b/drivers/staging/qlge/qlge_main.c @@ -3778,10 +3778,10 @@ static int ql_wol(struct ql_adapter *qdev) "Failed to set magic packet on %s.\n", qdev->ndev->name); return status; - } else - netif_info(qdev, drv, qdev->ndev, - "Enabled magic packet successfully on %s.\n", - qdev->ndev->name); + } + netif_info(qdev, drv, qdev->ndev, + "Enabled magic packet successfully on %s.\n", + qdev->ndev->name); wol |= MB_WOL_MAGIC_PKT; } diff --git a/drivers/staging/qlge/qlge_mpi.c b/drivers/staging/qlge/qlge_mpi.c index 3bb08d290525..fa178fc642a6 100644 --- a/drivers/staging/qlge/qlge_mpi.c +++ b/drivers/staging/qlge/qlge_mpi.c @@ -276,8 +276,8 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp) netif_err(qdev, ifup, qdev->ndev, "Failed to init CAM/Routing tables.\n"); return; - } else - clear_bit(QL_CAM_RT_SET, &qdev->flags); + } + clear_bit(QL_CAM_RT_SET, &qdev->flags); } /* Queue up a worker to check the frame