From patchwork Thu Jun 25 21:57:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 1317205 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=BkwjJFwy; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49tDR7550vz9sRR for ; Fri, 26 Jun 2020 07:58:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407424AbgFYV6I (ORCPT ); Thu, 25 Jun 2020 17:58:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405083AbgFYV6I (ORCPT ); Thu, 25 Jun 2020 17:58:08 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1C58C08C5C1; Thu, 25 Jun 2020 14:58:07 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id ne5so3729326pjb.5; Thu, 25 Jun 2020 14:58:07 -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=zvZtbrDBRF/tkY1XUgsUhw4qRWkNkbAOPkZ951cjMrY=; b=BkwjJFwyPkRmc45qqofzWlP9K8Xikjkm4IBfVGW1yaCij7b/CyzWOm7Zx9JCA0npIr iAN6V7Hw2BNH6G2PojQN0W+X2QvLctkrbU5GollJjoqSe0lCdGOccF+fgUx3851D4cji YRCRkUX85Oo/Ixf+N93NGSyoMKVAluxIEuAM6Z0Jg3t2uGu2BKb5TquTvvvvL+/ZZsHh f96PW9heA/zHSxjiIKWV1PWJSmK4vTCFoBoEzIzfRuFiA/VXWIKThkCEYBowwTGSfV1+ Tz/k4eEw755/YjLhFpPJmyy0wJTtu/rEgF3x5LKX5pGHyJrMFac1aZGsmwTOsOIELZ3p UlnQ== 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=zvZtbrDBRF/tkY1XUgsUhw4qRWkNkbAOPkZ951cjMrY=; b=W6YvRyCAE3joQ9y4MrsWnsyPFMDUxIX99gzFHaBVVmjq13iOXiTfYHHJ86IpC99IP5 MMd8izgq1kqmSJ95s89s7m4x06npE+uZMdIfqvttLVue0hhjGyAYEFM+tSXGjfCfNhmz xdQPd3rClQGgy+SvmDxBl1k+IYf7SzjyV1+2o/6iuJIhXvXfS6ma/bb2YJkI3dCXfr/r Hx0URate7z4kdVtAni1t2ITvKWrroUKg9bZCL0VLPgv0fx+XSSBKo4BZyn+/kecNqn6B /GUwvqSwZgKIThbB6/2EMDUScD5+GSHGNEk6qBpOG5tq7Z8nfH+UYTLhX/mQaQ1depjp vSgg== X-Gm-Message-State: AOAM530uyH+toNioKvEl1nqewQlnzYGkTyaDg6ndUwWaBKOieC85ubDn 2e3Gi6fTYc0o7vX/kMgUYyg= X-Google-Smtp-Source: ABdhPJyFz12WBHR1O1mbxNk9OexI3FzHpN1/Wva0TcWoy3grLRSNmrwdSXWjYu1nP9rU1wWZ8a0Cqg== X-Received: by 2002:a17:90a:d998:: with SMTP id d24mr46854pjv.43.1593122287530; Thu, 25 Jun 2020 14:58:07 -0700 (PDT) Received: from localhost ([2001:e42:102:1532:160:16:113:140]) by smtp.gmail.com with ESMTPSA id u25sm23564827pfm.115.2020.06.25.14.58.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 14:58:07 -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] staging: qlge: fix trailing */ in block comment Date: Fri, 26 Jun 2020 05:57:54 +0800 Message-Id: <20200625215755.70329-2-coiby.xu@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625215755.70329-1-coiby.xu@gmail.com> References: <20200625215755.70329-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 Remove trailing "*/" in block comments. 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(-) -- 2.27.0 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 21:57:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 1317206 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=LuDcozJV; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49tDRC50qwz9sRR for ; Fri, 26 Jun 2020 07:58:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407441AbgFYV6O (ORCPT ); Thu, 25 Jun 2020 17:58:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405083AbgFYV6M (ORCPT ); Thu, 25 Jun 2020 17:58:12 -0400 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 716E7C08C5C1; Thu, 25 Jun 2020 14:58:12 -0700 (PDT) Received: by mail-pl1-x642.google.com with SMTP id s14so3401794plq.6; Thu, 25 Jun 2020 14:58:12 -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=chesPouUZaMid4bYSr3ZV53BHmtt8IXHr4Z/luYFot0=; b=LuDcozJVGWZf2PPstxMq8byipniyQ1t3gGR7PzYjpfp4u6Nxn93t9kYEH07pOzGgVR ibwv2hoJ9dsmTvUgzQT9T+nafHvBNwAZoUpvQnzhwJ4Xyu7FSg+BMrBVJB0EK2Km3RxW 3SQhQYdwUXyXe3iFTohWKqu6h6iP1T5eqNhNLdChrqWV1noBDGP1dEFjBou6LLXu/WdN wFkhuu5krNhGGBNIb9IoBX/Bl1i8BcrovlztDsupMRHdMVDeES8WzTnFtOGJDPbZKmVu TKxb6q2kbkaYW8ixBRNnvUK0JwXriNv4KIIqxWJooh7QO5aPY7TgDlRqgYTTihvCSZ6k bnvw== 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=chesPouUZaMid4bYSr3ZV53BHmtt8IXHr4Z/luYFot0=; b=k4XSM8avhIEHJu328qazoSo2a9HwT7yRyWdEHf717q3M8RiqjBiDNjKcOatLD64OaF dFDoCJMn04AloHo/LVdu/EsQRccN9fTSCPj+BKpiOoOrcZSF7OeBCZkIIVavpDB6bm8l 7C47FikzP2vdRP/Px1J4xkE+A/Q/pr5V66ldGb5qMN42byZ0k5ofX+dT+GsANiK+sN74 n4TDMBWOF9Xu8GDgaQ3ubDw+RKsPAi136SOtlk6fRLnBZYqXhI0J4ulpKddrSP/032vM tcJurNBkRp20MCEeNscIgQJmQxhVyA0ecVECR/Fmj4dVLgne2wrSouxUUnggzaEFSSLq icGQ== X-Gm-Message-State: AOAM533WsPmTt48sCZ5XdYjOMtaf5hsvMp8pgEYYh/i6FWHZ+YTz4BDy WwwP9/Oaf1foHY0dTSFq/ok= X-Google-Smtp-Source: ABdhPJysTnii06o5O6nWMHrrsXvWoqh0pl9EuBuE56Z795qID84QiM0QF0K3yjm6XNGTrPkrTSUtfA== X-Received: by 2002:a17:90a:c797:: with SMTP id gn23mr29614pjb.165.1593122292080; Thu, 25 Jun 2020 14:58:12 -0700 (PDT) Received: from localhost ([2001:e42:102:1532:160:16:113:140]) by smtp.gmail.com with ESMTPSA id p8sm20896840pgs.29.2020.06.25.14.58.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 14:58:11 -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] staging: qlge: fix else after return or break Date: Fri, 26 Jun 2020 05:57:55 +0800 Message-Id: <20200625215755.70329-3-coiby.xu@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625215755.70329-1-coiby.xu@gmail.com> References: <20200625215755.70329-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 Remove unnecessary elses after return or break. 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(-) -- 2.27.0 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