From patchwork Thu Feb 11 06:43:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lijun Pan X-Patchwork-Id: 381604 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13C15C433E6 for ; Thu, 11 Feb 2021 06:44:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9EA164E7C for ; Thu, 11 Feb 2021 06:44:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229553AbhBKGoO (ORCPT ); Thu, 11 Feb 2021 01:44:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229501AbhBKGoM (ORCPT ); Thu, 11 Feb 2021 01:44:12 -0500 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E701C06174A for ; Wed, 10 Feb 2021 22:43:32 -0800 (PST) Received: by mail-oi1-x231.google.com with SMTP id f3so1256948oiw.13 for ; Wed, 10 Feb 2021 22:43:32 -0800 (PST) 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=x4+lzBuS/8r1ddumjZi3hvgG7HGx5HOlfFmw5XCNZfE=; b=tzeZ+VAPwyJBxrDCYroddn2W68pF9+UNXbYQjoRbTP20LXCwLsrvVgIwzXEK26AvWp r5IrzoeKnJ6HTs2fhPrcXxTYVJEmXzXqhWUZbo7B6C/mGGYGTIt7Q2NkxysNOLTNPhHU VkwPNfbQqKVqTj6/UEtY9QE9hjjeafpCoWlQVQsjXwUtRvVU++whK4DmgQ7ZGdQj5LWE DPyfqU3OgEj+N34XYO50gTBAFVo+VLgfUbs6AYcJkMwORyzRXkPU4091lWpAGwqYoAFa XwgdX0ivsIRGzCQ5fspsPJ0Fw1hndtsIInyn9V0duf7eotuGXjM6K9bKE9gW+UeSoFUz 5DWg== 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=x4+lzBuS/8r1ddumjZi3hvgG7HGx5HOlfFmw5XCNZfE=; b=K1L2zlsuq8xjkm6sLYtnbOhKhqNl0dnxztjWlD96XlVFCqk9Z9gTKzloBqk+VhGiO4 iLPrrPCO7/IuBHJRTNC2XVXRUxiSnYKtNRdlO7emC4Rppev5tXF0d2/XxreU0q3wQYpA PKY2L5aMvnh06r1owDIfef6DoQE3gaIzl0ycot2Cn1x/1yJgyasWr0I3izCMXwZKeCWZ YzBlIk9hA4R0acJ1xuxfn034S86wVXK2zGWKKAG7oljXpJ+/qwFlVHD7eDSj8kA51L8C BWKtOyof+oq/n4TbvrQ4VO7C2uWMZslwUgDZ5GLypxxmTO2xMbVXhSx1r2WN+sAmxoaT UkuQ== X-Gm-Message-State: AOAM531+z3NFYrq5cAWvjpxZ+bj1gW+lwhMyTd8Q4SdssIl9SlvLKo69 m+zZMLnwKmR7rM3t34mVt6mkEb5qe4w= X-Google-Smtp-Source: ABdhPJx3cSKjaHCzjB9SkBMpmdFRzWvKFzeiW6ctwuw9lM6aCmfsnX8kvCYUR/dHPS/HHRxcUGUxMQ== X-Received: by 2002:aca:af0c:: with SMTP id y12mr1814008oie.26.1613025811673; Wed, 10 Feb 2021 22:43:31 -0800 (PST) Received: from pear.attlocal.net ([2600:1700:271:1a80:302d:c724:5317:9751]) by smtp.gmail.com with ESMTPSA id y65sm993375oie.50.2021.02.10.22.43.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Feb 2021 22:43:31 -0800 (PST) From: Lijun Pan To: netdev@vger.kernel.org Cc: Lijun Pan , Saeed Mahameed Subject: [PATCH net-next v2 1/8] ibmvnic: prefer 'unsigned long' over 'unsigned long int' Date: Thu, 11 Feb 2021 00:43:18 -0600 Message-Id: <20210211064325.80591-2-lijunp213@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210211064325.80591-1-lijunp213@gmail.com> References: <20210211064325.80591-1-lijunp213@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix the following checkpatch warnings: WARNING: Prefer 'unsigned long' over 'unsigned long int' as the int is unnecessary WARNING: Prefer 'long' over 'long int' as the int is unnecessary Signed-off-by: Lijun Pan Reviewed-by: Saeed Mahameed --- drivers/net/ethernet/ibm/ibmvnic.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index a1579cd4bfe1..55970f02d9da 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -3654,8 +3654,8 @@ static int ibmvnic_send_crq(struct ibmvnic_adapter *adapter, int rc; netdev_dbg(adapter->netdev, "Sending CRQ: %016lx %016lx\n", - (unsigned long int)cpu_to_be64(u64_crq[0]), - (unsigned long int)cpu_to_be64(u64_crq[1])); + (unsigned long)cpu_to_be64(u64_crq[0]), + (unsigned long)cpu_to_be64(u64_crq[1])); if (!adapter->crq.active && crq->generic.first != IBMVNIC_CRQ_INIT_CMD) { @@ -3884,7 +3884,7 @@ static int send_login(struct ibmvnic_adapter *adapter) netdev_dbg(adapter->netdev, "Login Buffer:\n"); for (i = 0; i < (adapter->login_buf_sz - 1) / 8 + 1; i++) { netdev_dbg(adapter->netdev, "%016lx\n", - ((unsigned long int *)(adapter->login_buf))[i]); + ((unsigned long *)(adapter->login_buf))[i]); } memset(&crq, 0, sizeof(crq)); @@ -4252,7 +4252,7 @@ static void handle_query_ip_offload_rsp(struct ibmvnic_adapter *adapter) netdev_dbg(adapter->netdev, "Query IP Offload Buffer:\n"); for (i = 0; i < (sizeof(adapter->ip_offload_buf) - 1) / 8 + 1; i++) netdev_dbg(adapter->netdev, "%016lx\n", - ((unsigned long int *)(buf))[i]); + ((unsigned long *)(buf))[i]); netdev_dbg(adapter->netdev, "ipv4_chksum = %d\n", buf->ipv4_chksum); netdev_dbg(adapter->netdev, "ipv6_chksum = %d\n", buf->ipv6_chksum); @@ -4411,7 +4411,7 @@ static void handle_request_cap_rsp(union ibmvnic_crq *crq, case PARTIALSUCCESS: dev_info(dev, "req=%lld, rsp=%ld in %s queue, retrying.\n", *req_value, - (long int)be64_to_cpu(crq->request_capability_rsp. + (long)be64_to_cpu(crq->request_capability_rsp. number), name); if (be16_to_cpu(crq->request_capability_rsp.capability) == @@ -4482,7 +4482,7 @@ static int handle_login_rsp(union ibmvnic_crq *login_rsp_crq, netdev_dbg(adapter->netdev, "Login Response Buffer:\n"); for (i = 0; i < (adapter->login_rsp_buf_sz - 1) / 8 + 1; i++) { netdev_dbg(adapter->netdev, "%016lx\n", - ((unsigned long int *)(adapter->login_rsp_buf))[i]); + ((unsigned long *)(adapter->login_rsp_buf))[i]); } /* Sanity checks */ @@ -4825,8 +4825,8 @@ static void ibmvnic_handle_crq(union ibmvnic_crq *crq, long rc; netdev_dbg(netdev, "Handling CRQ: %016lx %016lx\n", - (unsigned long int)cpu_to_be64(u64_crq[0]), - (unsigned long int)cpu_to_be64(u64_crq[1])); + (unsigned long)cpu_to_be64(u64_crq[0]), + (unsigned long)cpu_to_be64(u64_crq[1])); switch (gen_crq->first) { case IBMVNIC_CRQ_INIT_RSP: switch (gen_crq->cmd) { From patchwork Thu Feb 11 06:43:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lijun Pan X-Patchwork-Id: 381603 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D14AC433E9 for ; Thu, 11 Feb 2021 06:44:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EDBE864DAD for ; Thu, 11 Feb 2021 06:44:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229592AbhBKGoS (ORCPT ); Thu, 11 Feb 2021 01:44:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229501AbhBKGoP (ORCPT ); Thu, 11 Feb 2021 01:44:15 -0500 Received: from mail-oo1-xc2b.google.com (mail-oo1-xc2b.google.com [IPv6:2607:f8b0:4864:20::c2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9AD3BC061756 for ; Wed, 10 Feb 2021 22:43:35 -0800 (PST) Received: by mail-oo1-xc2b.google.com with SMTP id g46so1081369ooi.9 for ; Wed, 10 Feb 2021 22:43:35 -0800 (PST) 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=ktYJYSGz8Vs7UFvmfdMVsRlIJMea6UNHml/3n4sjHRM=; b=oK8hFe1Gy9d39mTFrzOFpNDRO27MoXefE6wutBinLFw0TEs2NSzsyBZZXavkSYH3O2 rXBW5I5zcvgjWdave36OGu1DF6P+b4pnlKXNxPkaL8Kr+iJnh1FIlWrRbJkvTXLrhChx ZYWV8cG/Zi7oOR+HO/mSj/oiRe0hdkh3g1F6+lxa8duEHi7Q5aIhn5yvnn+fYuBYtCHG nJQfoIJ5kmHBgKtEOT4ZSsKylZOJ6NiOBMOYInDceBc5NDwc8jkOlqOQUHCNYnWSVFMV x1bS4hr1KdzPrnpXnuS5s1MH+iQvQhdFA6SNvK7JsPAF2i0oe5OqJRHZ2DeQnBcW8UlA 2C9Q== 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=ktYJYSGz8Vs7UFvmfdMVsRlIJMea6UNHml/3n4sjHRM=; b=Gtsbq3dPsZBpvZTRENEB4CA0a/rFOnaULfboy/v1reCnA7gvOcID8zi9c7R/R4ImSf /mAItDGu47ZdHmQELTk3TQZZqKg70dBl1oQBQDEQHYxs3fdGRyGuu2qDDyau+7ZbNEm6 vbi1Ubk/50bH/b/VY58bXyA0ONrNkCn4w6QyM0yxO8SwLKQm8+O4bA3p6kw8Sf6ye+QU 9NAqJXi/Dz25FuZBzJObLd7UPqcYUuCaPfotE8JFOTuS/5pNnFfaAovdZATcPSLLzpU8 KW3gmem7RLStDAn6hPtCoTh+0Q/0BP9deAAvmz/SyD3cFfJIzjdR54eaXsTezla+TDHM af0w== X-Gm-Message-State: AOAM530ytXbwFm2GW+vwZpOnDZgzLA1PrNs1Qp3lrUDKAwE0ofCcPvNb VphkW0whao/tf8XbClU3P25iVBigga0= X-Google-Smtp-Source: ABdhPJyTUhXtDVWjEBJude+SufgOOyaydn0gYKfQVHBigDKmtpYBQxpR559UaHMabkDsAFuLxiw5Zg== X-Received: by 2002:a4a:d136:: with SMTP id n22mr3056729oor.88.1613025814656; Wed, 10 Feb 2021 22:43:34 -0800 (PST) Received: from pear.attlocal.net ([2600:1700:271:1a80:302d:c724:5317:9751]) by smtp.gmail.com with ESMTPSA id y65sm993375oie.50.2021.02.10.22.43.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Feb 2021 22:43:34 -0800 (PST) From: Lijun Pan To: netdev@vger.kernel.org Cc: Lijun Pan , Saeed Mahameed Subject: [PATCH net-next v2 2/8] ibmvnic: fix block comments Date: Thu, 11 Feb 2021 00:43:19 -0600 Message-Id: <20210211064325.80591-3-lijunp213@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210211064325.80591-1-lijunp213@gmail.com> References: <20210211064325.80591-1-lijunp213@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix the following checkpatch warning: WARNING: networking block comments don't use an empty /* line, use /* Comment... Signed-off-by: Lijun Pan Reviewed-by: Saeed Mahameed --- drivers/net/ethernet/ibm/ibmvnic.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 55970f02d9da..5c6f6a7b2e3f 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1221,8 +1221,7 @@ static int ibmvnic_open(struct net_device *netdev) rc = __ibmvnic_open(netdev); out: - /* - * If open fails due to a pending failover, set device state and + /* If open fails due to a pending failover, set device state and * return. Device operation will be handled by reset routine. */ if (rc && adapter->failover_pending) { @@ -1946,8 +1945,7 @@ static int do_reset(struct ibmvnic_adapter *adapter, if (!(adapter->reset_reason == VNIC_RESET_CHANGE_PARAM)) rtnl_lock(); - /* - * Now that we have the rtnl lock, clear any pending failover. + /* Now that we have the rtnl lock, clear any pending failover. * This will ensure ibmvnic_open() has either completed or will * block until failover is complete. */ @@ -2249,8 +2247,7 @@ static void __ibmvnic_reset(struct work_struct *work) spin_unlock_irqrestore(&adapter->state_lock, flags); if (adapter->force_reset_recovery) { - /* - * Since we are doing a hard reset now, clear the + /* Since we are doing a hard reset now, clear the * failover_pending flag so we don't ignore any * future MOBILITY or other resets. */ @@ -2322,8 +2319,7 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter, unsigned long flags; int ret; - /* - * If failover is pending don't schedule any other reset. + /* If failover is pending don't schedule any other reset. * Instead let the failover complete. If there is already a * a failover reset scheduled, we will detect and drop the * duplicate reset when walking the ->rwi_list below. From patchwork Thu Feb 11 06:43:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lijun Pan X-Patchwork-Id: 382367 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DECBC43381 for ; Thu, 11 Feb 2021 06:44:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 145C664E7E for ; Thu, 11 Feb 2021 06:44:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229626AbhBKGoV (ORCPT ); Thu, 11 Feb 2021 01:44:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229582AbhBKGoS (ORCPT ); Thu, 11 Feb 2021 01:44:18 -0500 Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7355C0613D6 for ; Wed, 10 Feb 2021 22:43:37 -0800 (PST) Received: by mail-oi1-x22a.google.com with SMTP id i3so5016576oif.1 for ; Wed, 10 Feb 2021 22:43:37 -0800 (PST) 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=+2XP67/P4figV1G8mvagTyWJ4pRaX6cBiE+2myvoFuA=; b=LtIE6FyzYWzJ/wKDjthZdhi3Dc34k1/c/EHf7Lk7p9JDiYQgN0a7nDlUZciv5SVaCR dIQWoBmyhTZemWXXGakkdSk6MLuQmw9ORJOT9MRoKIHsstxULP8xxTjqW1HXyUUCUD+h kqxt0RLj72qYrBv8KoLYSI/a/jrLa1O2srrZ3kkvrFcxL2kfBhOo/K+/Zm7JGrjf+lJF nVKoVcZ7W0r0NKynDw3wGUCqq0n+Mnd3wPUTu0kVjluVO3hb9XPoCjHK1HXqs9Ps7dSC itkoCqtzIecX2EKbXbkuWNdqWCB0czQW5qZqesEuKxx3sXSFEYHFcVBjFrnMmSy521su qsUg== 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=+2XP67/P4figV1G8mvagTyWJ4pRaX6cBiE+2myvoFuA=; b=bLtc2JWv3AV0hgMYBLpJlFyuPi0jm5p4FIdcWMc0MhRqmJk/s+VNDLh5DV+sOCUuZv XOhTEoygXCGIK1jdqdbckkkIIuua5Y/TuL6srguAuUNJ9z5awhy7WCkI6LLO3+MZR/oT xgeDUswskQvTlk1yG+aPxQqPRBpdhxEo4o3KhYy2zb7yn34Owai/3ts9DOD9FRcnGB2t 5FfOw+B8Q6EMW5i1SCTnGU7Ufld6NsLTNgVCyVCUpTONXt9xZvHbQQouHTsZz4G3Y4Jc tpZgxu6lrNwzVCB76ptm3PvhlYdJ9eXnhMOsIlhXmUTcWYDbTAWgm9+LPs5j81FXpbNn Hevg== X-Gm-Message-State: AOAM533Icy7mLmVp1QAXCm9PpcaxNNrBPOHV/2WhrisQkqO02W7tIgV2 SdjrEoRIDXYLtMWvShkb2K7YurP4y8Q= X-Google-Smtp-Source: ABdhPJxYBTgFk0oSqRY7YaHmpsYjpJqbQ0cAOThUUejEhkTuJwpy9K35vmF47DDajNQMbbzlA50HMA== X-Received: by 2002:aca:3b8b:: with SMTP id i133mr1837685oia.132.1613025817195; Wed, 10 Feb 2021 22:43:37 -0800 (PST) Received: from pear.attlocal.net ([2600:1700:271:1a80:302d:c724:5317:9751]) by smtp.gmail.com with ESMTPSA id y65sm993375oie.50.2021.02.10.22.43.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Feb 2021 22:43:36 -0800 (PST) From: Lijun Pan To: netdev@vger.kernel.org Cc: Lijun Pan , Saeed Mahameed Subject: [PATCH net-next v2 3/8] ibmvnic: fix braces Date: Thu, 11 Feb 2021 00:43:20 -0600 Message-Id: <20210211064325.80591-4-lijunp213@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210211064325.80591-1-lijunp213@gmail.com> References: <20210211064325.80591-1-lijunp213@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix the following checkpatch warning: WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Lijun Pan Reviewed-by: Saeed Mahameed --- drivers/net/ethernet/ibm/ibmvnic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 5c6f6a7b2e3f..6c1fc73d66dc 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -2040,9 +2040,8 @@ static int do_reset(struct ibmvnic_adapter *adapter, } rc = ibmvnic_login(netdev); - if (rc) { + if (rc) goto out; - } if (adapter->reset_reason == VNIC_RESET_CHANGE_PARAM) { rc = init_resources(adapter); From patchwork Thu Feb 11 06:43:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lijun Pan X-Patchwork-Id: 382366 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 868A0C433E0 for ; Thu, 11 Feb 2021 06:44:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5601E64E7A for ; Thu, 11 Feb 2021 06:44:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229642AbhBKGoX (ORCPT ); Thu, 11 Feb 2021 01:44:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229617AbhBKGoU (ORCPT ); Thu, 11 Feb 2021 01:44:20 -0500 Received: from mail-oo1-xc29.google.com (mail-oo1-xc29.google.com [IPv6:2607:f8b0:4864:20::c29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80A3CC061786 for ; Wed, 10 Feb 2021 22:43:40 -0800 (PST) Received: by mail-oo1-xc29.google.com with SMTP id t196so1098089oot.2 for ; Wed, 10 Feb 2021 22:43:40 -0800 (PST) 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=ZnztfgT8qvtCptuO4dkMSZ08gS4MffnWEFlzWYw2qm8=; b=FJltONKyAx2e/ZbByHoX7rvTdfWri6lWf3IDcIbO9jfgLsm27GpLAqZnX+MSeTNmH8 u4RU3DL5cekAPNcrgqGP4LpG+s7tnZGazMJ1deJ1LaR/fFOdxGMy4cqGc46Do/SWwFH7 xLBWFGHZckmk0qYtf6eNEA2tb/lOeVbvOZ6+uXiVZUXw42JutP3u5ECWbUxjvxFqR8By 1NIYX4pIHLTVl2fkvjfQEgFSJ+WmLnwIXrZQT4rY/I1iEqLosGYmJzd2CggtsPL61WTH Mcz2MfwQbasQz8Tp5S4suIMJxnPlgxgqUhWSkqQCcejwJXxFF+2nI3YloTdPIZ0+WBtb 9CFQ== 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=ZnztfgT8qvtCptuO4dkMSZ08gS4MffnWEFlzWYw2qm8=; b=aLvKnYoIvrrgM5jP6q0jpZsrJ1aH9u0IhwCgh1PWrdi7NEu7I/j3ZbnSQ8FpplSV8r Mb6ctT9lbVNRaQmjIIvpJZpOzwXXcWWciwRkBqIrrLKkqBZCnh16Sa9lvBGohJaYimPY 7kC/W6zeUyrSQeAOPpMCbfJaU94JyBp231H8G8JOePz0pNnpzo4vssprukZiU92Yoh71 dAXxHOnL6NRToAGh30aoGS8xVwQi1NoLpznCj4OvI/KFyXZmoL6oPuu8ydrbWAV9rd35 fa+5RbZwhUb1Mhy2XrLGdXtAjDcIvu2kJmzj5ZxKdIq1aWg2WaqIbhhoNEmV8nmMShuS EH1Q== X-Gm-Message-State: AOAM531ffbK4Zoa6hGAkBxBevb/atfaOBo8kZbDJQ3upFGe+5d7MQY7e Y7pt1ndqis4FanTMUE9/Q11+tzcF4E4= X-Google-Smtp-Source: ABdhPJy5e/mUrfVG9+bM010mQjQ/sQ60sFgBwcPO9ZIVJMJDE4ufJNZv2gBR3Lft/OzbtRKt8U6jbg== X-Received: by 2002:a4a:dc51:: with SMTP id q17mr4598431oov.76.1613025819677; Wed, 10 Feb 2021 22:43:39 -0800 (PST) Received: from pear.attlocal.net ([2600:1700:271:1a80:302d:c724:5317:9751]) by smtp.gmail.com with ESMTPSA id y65sm993375oie.50.2021.02.10.22.43.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Feb 2021 22:43:39 -0800 (PST) From: Lijun Pan To: netdev@vger.kernel.org Cc: Lijun Pan , Saeed Mahameed Subject: [PATCH net-next v2 4/8] ibmvnic: avoid multiple line dereference Date: Thu, 11 Feb 2021 00:43:21 -0600 Message-Id: <20210211064325.80591-5-lijunp213@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210211064325.80591-1-lijunp213@gmail.com> References: <20210211064325.80591-1-lijunp213@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix the following checkpatch warning: WARNING: Avoid multiple line dereference Signed-off-by: Lijun Pan Reviewed-by: Saeed Mahameed --- drivers/net/ethernet/ibm/ibmvnic.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 6c1fc73d66dc..67b09a53d7ac 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -2440,9 +2440,8 @@ static int ibmvnic_poll(struct napi_struct *napi, int budget) if (!pending_scrq(adapter, rx_scrq)) break; next = ibmvnic_next_scrq(adapter, rx_scrq); - rx_buff = - (struct ibmvnic_rx_buff *)be64_to_cpu(next-> - rx_comp.correlator); + rx_buff = (struct ibmvnic_rx_buff *) + be64_to_cpu(next->rx_comp.correlator); /* do error checking */ if (next->rx_comp.rc) { netdev_dbg(netdev, "rx buffer returned with rc %x\n", @@ -3855,15 +3854,15 @@ static int send_login(struct ibmvnic_adapter *adapter) for (i = 0; i < adapter->req_tx_queues; i++) { if (adapter->tx_scrq[i]) { - tx_list_p[i] = cpu_to_be64(adapter->tx_scrq[i]-> - crq_num); + tx_list_p[i] = + cpu_to_be64(adapter->tx_scrq[i]->crq_num); } } for (i = 0; i < adapter->req_rx_queues; i++) { if (adapter->rx_scrq[i]) { - rx_list_p[i] = cpu_to_be64(adapter->rx_scrq[i]-> - crq_num); + rx_list_p[i] = + cpu_to_be64(adapter->rx_scrq[i]->crq_num); } } @@ -4406,8 +4405,8 @@ static void handle_request_cap_rsp(union ibmvnic_crq *crq, case PARTIALSUCCESS: dev_info(dev, "req=%lld, rsp=%ld in %s queue, retrying.\n", *req_value, - (long)be64_to_cpu(crq->request_capability_rsp. - number), name); + (long)be64_to_cpu(crq->request_capability_rsp.number), + name); if (be16_to_cpu(crq->request_capability_rsp.capability) == REQ_MTU) { From patchwork Thu Feb 11 06:43:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lijun Pan X-Patchwork-Id: 381602 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5C4EC433E6 for ; Thu, 11 Feb 2021 06:45:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC8E564E7D for ; Thu, 11 Feb 2021 06:45:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229699AbhBKGo7 (ORCPT ); Thu, 11 Feb 2021 01:44:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229648AbhBKGov (ORCPT ); Thu, 11 Feb 2021 01:44:51 -0500 Received: from mail-ot1-x334.google.com (mail-ot1-x334.google.com [IPv6:2607:f8b0:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AB7DC061788 for ; Wed, 10 Feb 2021 22:43:43 -0800 (PST) Received: by mail-ot1-x334.google.com with SMTP id k10so4280588otl.2 for ; Wed, 10 Feb 2021 22:43:43 -0800 (PST) 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=it8SmkoPR+YtqAuTi7CdU+4vERt/ARK6RZ7nOtpYH7E=; b=KN6gLbCtaXe+mopa7YrEZ6rMPzZvZjqRLUTthB+qPoODuYSq+o/FBQHiwFq/U3sRgY TtDcJwdu9H6yT8RRF+tjTIhg6N8BWM43iY3DNyAFX4AJ0Qy0YzvxfA4NPWM5FxttdPVN j5X+DFjGW/weliDF11OE5HUtUWfUich9MSG5PeY2xwVwFkhQ67BBf2e0bbew4jP99ATn 1lDDpwT/3u3hZuQwvk0H5WjMw5p4UsMoOPY4n0ZtdoD4E1BPCnzCZqstK0nD2zYgDG20 SwzumBlL1Sdifhd+rAtuPaB3Zonrhmrab3zcxdsU29HUI1Es68/csEgVqdiDlXiPrC5t b5LQ== 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=it8SmkoPR+YtqAuTi7CdU+4vERt/ARK6RZ7nOtpYH7E=; b=Gmld1I2jSdRqZTccHk57ollLcsNKXFi103imO2pF/pQazMfXEb9uNKq/y9yunknVh/ rnsT8f/+1Mqvv58BxiX15ukHUPqDNVQ5UhIShBZptaQF/5MJy9i+A40pB1zpDRODK/fo cjZw8HEW9tpmy/f8tN9gsZKtieb6MHCI4xdZLY+hMH9f3H9Tta68PV9nLJlUguP/eUg2 SaM7XSyN0AZBLq9L1Sa1S/dkZAN60du5n1vNvPw3eKbvcMBtxZG+EyNv6JWTbfS2yQv0 OiuDTG3IMiOT9M+Q4PSi8a4TkqZfrBZSdztoTbn4qCk6bPDxZ5QLRgj4pEu40P50BThs gUJQ== X-Gm-Message-State: AOAM531eKF8pjHWt2ab/At7FMId7oBApPUl7PndNfGP31YT/m8NVb2/a z6SAinIF7e14mmj1QhgqWcVBWXUUmK4= X-Google-Smtp-Source: ABdhPJzYOzRO6I3b11vOTrK1GTtrUVBtGVNsBzfwP+r/Popnc+9H+8TcVui9u8dJUDMFcrEO4a3c5g== X-Received: by 2002:a9d:69d9:: with SMTP id v25mr280366oto.126.1613025822659; Wed, 10 Feb 2021 22:43:42 -0800 (PST) Received: from pear.attlocal.net ([2600:1700:271:1a80:302d:c724:5317:9751]) by smtp.gmail.com with ESMTPSA id y65sm993375oie.50.2021.02.10.22.43.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Feb 2021 22:43:42 -0800 (PST) From: Lijun Pan To: netdev@vger.kernel.org Cc: Lijun Pan , Saeed Mahameed Subject: [PATCH net-next v2 5/8] ibmvnic: fix miscellaneous checks Date: Thu, 11 Feb 2021 00:43:22 -0600 Message-Id: <20210211064325.80591-6-lijunp213@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210211064325.80591-1-lijunp213@gmail.com> References: <20210211064325.80591-1-lijunp213@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix the following checkpatch checks: CHECK: Macro argument 'off' may be better as '(off)' to avoid precedence issues CHECK: Alignment should match open parenthesis CHECK: multiple assignments should be avoided CHECK: Blank lines aren't necessary before a close brace '}' CHECK: Please use a blank line after function/struct/union/enum declarations CHECK: Unnecessary parentheses around 'rc != H_FUNCTION' Signed-off-by: Lijun Pan Reviewed-by: Saeed Mahameed --- drivers/net/ethernet/ibm/ibmvnic.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 67b09a53d7ac..0c27a1f9663a 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -115,7 +115,7 @@ struct ibmvnic_stat { #define IBMVNIC_STAT_OFF(stat) (offsetof(struct ibmvnic_adapter, stats) + \ offsetof(struct ibmvnic_statistics, stat)) -#define IBMVNIC_GET_STAT(a, off) (*((u64 *)(((unsigned long)(a)) + off))) +#define IBMVNIC_GET_STAT(a, off) (*((u64 *)(((unsigned long)(a)) + (off)))) static const struct ibmvnic_stat ibmvnic_stats[] = { {"rx_packets", IBMVNIC_STAT_OFF(rx_packets)}, @@ -2069,14 +2069,14 @@ static int do_reset(struct ibmvnic_adapter *adapter, rc = reset_tx_pools(adapter); if (rc) { netdev_dbg(adapter->netdev, "reset tx pools failed (%d)\n", - rc); + rc); goto out; } rc = reset_rx_pools(adapter); if (rc) { netdev_dbg(adapter->netdev, "reset rx pools failed (%d)\n", - rc); + rc); goto out; } } @@ -2333,7 +2333,8 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter, if (adapter->state == VNIC_PROBING) { netdev_warn(netdev, "Adapter reset during probe\n"); - ret = adapter->init_done_rc = EAGAIN; + adapter->init_done_rc = EAGAIN; + ret = EAGAIN; goto err; } @@ -2746,7 +2747,6 @@ static int ibmvnic_set_channels(struct net_device *netdev, channels->rx_count, channels->tx_count, adapter->req_rx_queues, adapter->req_tx_queues); return ret; - } static void ibmvnic_get_strings(struct net_device *dev, u32 stringset, u8 *data) @@ -2835,8 +2835,8 @@ static void ibmvnic_get_ethtool_stats(struct net_device *dev, return; for (i = 0; i < ARRAY_SIZE(ibmvnic_stats); i++) - data[i] = be64_to_cpu(IBMVNIC_GET_STAT(adapter, - ibmvnic_stats[i].offset)); + data[i] = be64_to_cpu(IBMVNIC_GET_STAT + (adapter, ibmvnic_stats[i].offset)); for (j = 0; j < adapter->req_tx_queues; j++) { data[i] = adapter->tx_stats_buffers[j].packets; @@ -2876,6 +2876,7 @@ static int ibmvnic_set_priv_flags(struct net_device *netdev, u32 flags) return 0; } + static const struct ethtool_ops ibmvnic_ethtool_ops = { .get_drvinfo = ibmvnic_get_drvinfo, .get_msglevel = ibmvnic_get_msglevel, @@ -3145,7 +3146,7 @@ static int enable_scrq_irq(struct ibmvnic_adapter *adapter, /* H_EOI would fail with rc = H_FUNCTION when running * in XIVE mode which is expected, but not an error. */ - if (rc && (rc != H_FUNCTION)) + if (rc && rc != H_FUNCTION) dev_err(dev, "H_EOI FAILED irq 0x%llx. rc=%ld\n", val, rc); } From patchwork Thu Feb 11 06:43:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lijun Pan X-Patchwork-Id: 382365 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 118DAC433E0 for ; Thu, 11 Feb 2021 06:45:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D564764E7A for ; Thu, 11 Feb 2021 06:45:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229701AbhBKGpM (ORCPT ); Thu, 11 Feb 2021 01:45:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229649AbhBKGov (ORCPT ); Thu, 11 Feb 2021 01:44:51 -0500 Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E84B0C06178A for ; Wed, 10 Feb 2021 22:43:44 -0800 (PST) Received: by mail-oi1-x22e.google.com with SMTP id m7so4964584oiw.12 for ; Wed, 10 Feb 2021 22:43:44 -0800 (PST) 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=lThbLDzbOYB7OPxXx1w2lY+QcS7QaN1y+3TBSn73CLE=; b=sxISHs3M+lYQVouoH3Rw5SxREkmHVXtpcixnOp5AQTptS4YZIacuZLw6eG0E5iABDc wipTXXuDlHjttIX3xt7D6Cj4DEJV8Yrl3HwO9RAOgxFZjGrXdQN42f061Br19ZUGTozx 5ijudRAeZU2HY7Auy5Md50VcC18sc82n5uWqnHkElPXyxmqLlKFR9Mi0xSvKsxZlLB5L 9b1R6mbOcYWpRSRLv0OsN4qZtZodpEKZqIFuJe4/WBFjxLyu34Qu+J01XOyymfkSbtGX u15dy/Ihuujp5fpwleKGV7oGVgvaBw2Thx8/Hf9YXaQiTjbkro8/DyXNm34R2MjycC52 KjPQ== 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=lThbLDzbOYB7OPxXx1w2lY+QcS7QaN1y+3TBSn73CLE=; b=FCoP2hRe5gStcZllsGrq+PizPdQUwzBqe2Qvn9csD9/+6orrmafxsgwsqH81V7/71L jxQ1YxC1Bd/kQBXsd/GbAeUYGQwCfXn1rqnYEL34afHJiJkoAPrSKWeIhOVpfxMDVYqI ELV5KFRm37FYy9gRIg63TLG5x5SSHlNdTJWjT9nzssicYjhVai5ZlAnZDwe6viT8kW8b hZ7ubhf2OR5Dh55EUzYf8c4e3ZpqaG9cxK7URnTXLmIqkedHD/8mrwm6w3G9nf+MTGSp VM0C/EfxvO+sddDS2EJgyGJkVJUoPFRIceux9Jf12l8iyo7kyKlWYBeAnsKfI0zUusiK jJCQ== X-Gm-Message-State: AOAM531wtJG9AfXpYMtBONnbyv1nJLTY0j/4uEMGOfjAAdaFqx+I+psX gersL8yBpZNXAXXJoPXkm/d7m83dFA0= X-Google-Smtp-Source: ABdhPJyA6Ml++QKC9U9MEQ3qrVVjeD258ZDUWMHPaCQKBvKztcKzr1NTEUdqKQpyAOA9cPDyjubiZg== X-Received: by 2002:aca:570d:: with SMTP id l13mr1766325oib.159.1613025824204; Wed, 10 Feb 2021 22:43:44 -0800 (PST) Received: from pear.attlocal.net ([2600:1700:271:1a80:302d:c724:5317:9751]) by smtp.gmail.com with ESMTPSA id y65sm993375oie.50.2021.02.10.22.43.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Feb 2021 22:43:43 -0800 (PST) From: Lijun Pan To: netdev@vger.kernel.org Cc: Lijun Pan , Saeed Mahameed Subject: [PATCH net-next v2 6/8] ibmvnic: add comments for spinlock_t definitions Date: Thu, 11 Feb 2021 00:43:23 -0600 Message-Id: <20210211064325.80591-7-lijunp213@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210211064325.80591-1-lijunp213@gmail.com> References: <20210211064325.80591-1-lijunp213@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There are several spinlock_t definitions without comments. Add them. Signed-off-by: Lijun Pan Reviewed-by: Saeed Mahameed --- drivers/net/ethernet/ibm/ibmvnic.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h index c09c3f6bba9f..8f73a30a7593 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.h +++ b/drivers/net/ethernet/ibm/ibmvnic.h @@ -845,6 +845,7 @@ struct ibmvnic_crq_queue { union ibmvnic_crq *msgs; int size, cur; dma_addr_t msg_token; + /* Used for serialization of msgs, cur */ spinlock_t lock; bool active; char name[32]; @@ -876,6 +877,7 @@ struct ibmvnic_sub_crq_queue { unsigned int irq; unsigned int pool_index; int scrq_num; + /* Used for serialization of msgs, cur */ spinlock_t lock; struct sk_buff *rx_skb_top; struct ibmvnic_adapter *adapter; @@ -1080,9 +1082,12 @@ struct ibmvnic_adapter { struct tasklet_struct tasklet; enum vnic_state state; + /* Used for serializatin of state field */ + spinlock_t state_lock; enum ibmvnic_reset_reason reset_reason; - spinlock_t rwi_lock; struct list_head rwi_list; + /* Used for serialization of rwi_list */ + spinlock_t rwi_lock; struct work_struct ibmvnic_reset; struct delayed_work ibmvnic_delayed_reset; unsigned long resetting; @@ -1096,7 +1101,4 @@ struct ibmvnic_adapter { struct ibmvnic_tunables desired; struct ibmvnic_tunables fallback; - - /* Used for serializatin of state field */ - spinlock_t state_lock; }; From patchwork Thu Feb 11 06:43:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lijun Pan X-Patchwork-Id: 381601 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BD98C433DB for ; Thu, 11 Feb 2021 06:46:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3DD3064E77 for ; Thu, 11 Feb 2021 06:46:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229705AbhBKGpk (ORCPT ); Thu, 11 Feb 2021 01:45:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229662AbhBKGox (ORCPT ); Thu, 11 Feb 2021 01:44:53 -0500 Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FE7BC06178B for ; Wed, 10 Feb 2021 22:43:48 -0800 (PST) Received: by mail-oi1-x22b.google.com with SMTP id u66so4981678oig.9 for ; Wed, 10 Feb 2021 22:43:48 -0800 (PST) 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=7JOuhWvIWKqN8Se22XaC8yOwoXuCUjA+EBQMIgDHhow=; b=LFsA3uXIPHF0wqBcyf+NVb8olnwDwZ+A0Hh4+Jt9bSQVtpW19IVmYCA0thAs0/H5T7 FaCdUYDpaVtFQORxrztyenA1eCCrtjManZ0iB/pd9vRtgB4yn40DHcb2Wp1AgdlrL99Z wiBuSD4r36RtDtXHnHknGlHltGqY4GAfXZXyRlAZb9T+OAvdy7xFYkwbPSYAdDkVI9Cl c508CqCiyaBHCcrtpIoitdTTn3/dD4GnxQ2pXWAq9fPHSC1Wytucbu8/HCSmpWPQQim2 ZlvPAa1RVZ1dCJB2urbtMo0p5+isw5VogpKe2WEj4ln7M8kwfokGH8OtGqOPLwrY93i8 OwNw== 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=7JOuhWvIWKqN8Se22XaC8yOwoXuCUjA+EBQMIgDHhow=; b=CeH4X9L7Xu6bFAon7QpFj1jKxvTQc00HeF0JPv6u48gmv7MOMs7I+b+sZgz9FSjw1u aRs/yEgm1CDZYCQqawJQfbLhyGbPyh0RygvT2Knd0Wq8bYE+JsGr27o2DhuPZSFcfl+1 viVk+AADo/B9NEWZAtNyDmjTsuSC0M7dx/cut8YTYh5kXAO0C/gBzvmmrkKTaGZtF7cb BgXv7iBXNkl6qkXg3yCx1jANh/BmUJSI/YH4mQKTCi61RSeSIudZcYBYI3jrsMF83Q4s Er/odhKjWzMBgESyrhfsjBGkFU8uwzDKDXS2Ph9KI0bdMpM5jnqRbekNMTA+YhGmg0Ue CQxw== X-Gm-Message-State: AOAM530GFAhmtE8Jazcgp+nMGvVBPiEDE6vNowd0F8EXhQtbr0Kyj6Ex au/kwQEHeEmq6enKp0BwTbYIAWVR3IU= X-Google-Smtp-Source: ABdhPJyUvZFZ6y+8MjOErjgZIkDDINJcf2X3kUZNnLWyM47KodaXVvCdIEW5NcRjCU+DiEZT+GrQ3g== X-Received: by 2002:aca:230e:: with SMTP id e14mr1117719oie.6.1613025827639; Wed, 10 Feb 2021 22:43:47 -0800 (PST) Received: from pear.attlocal.net ([2600:1700:271:1a80:302d:c724:5317:9751]) by smtp.gmail.com with ESMTPSA id y65sm993375oie.50.2021.02.10.22.43.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Feb 2021 22:43:47 -0800 (PST) From: Lijun Pan To: netdev@vger.kernel.org Cc: Lijun Pan , Saeed Mahameed Subject: [PATCH net-next v2 7/8] ibmvnic: remove unused spinlock_t stats_lock definition Date: Thu, 11 Feb 2021 00:43:24 -0600 Message-Id: <20210211064325.80591-8-lijunp213@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210211064325.80591-1-lijunp213@gmail.com> References: <20210211064325.80591-1-lijunp213@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org stats_lock is no longer used. So remove it. Signed-off-by: Lijun Pan Reviewed-by: Saeed Mahameed --- drivers/net/ethernet/ibm/ibmvnic.c | 2 -- drivers/net/ethernet/ibm/ibmvnic.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 0c27a1f9663a..778e56e05cd7 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -5295,8 +5295,6 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id) netdev->ethtool_ops = &ibmvnic_ethtool_ops; SET_NETDEV_DEV(netdev, &dev->dev); - spin_lock_init(&adapter->stats_lock); - INIT_WORK(&adapter->ibmvnic_reset, __ibmvnic_reset); INIT_DELAYED_WORK(&adapter->ibmvnic_delayed_reset, __ibmvnic_delayed_reset); diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h index 8f73a30a7593..270d1cac86a4 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.h +++ b/drivers/net/ethernet/ibm/ibmvnic.h @@ -987,7 +987,6 @@ struct ibmvnic_adapter { struct ibmvnic_statistics stats; dma_addr_t stats_token; struct completion stats_done; - spinlock_t stats_lock; int replenish_no_mem; int replenish_add_buff_success; int replenish_add_buff_failure; From patchwork Thu Feb 11 06:43:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lijun Pan X-Patchwork-Id: 382364 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BE48C433E9 for ; Thu, 11 Feb 2021 06:46:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 547DC64DAD for ; Thu, 11 Feb 2021 06:46:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229737AbhBKGp4 (ORCPT ); Thu, 11 Feb 2021 01:45:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbhBKGox (ORCPT ); Thu, 11 Feb 2021 01:44:53 -0500 Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CB5FC06178C for ; Wed, 10 Feb 2021 22:43:50 -0800 (PST) Received: by mail-ot1-x332.google.com with SMTP id s107so4246758otb.8 for ; Wed, 10 Feb 2021 22:43:50 -0800 (PST) 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=gr0eKrk4K/BYOP1u+/BzgsKv0MAbRZ7OTW4YmnTfTpo=; b=PgaObfFFeiEuMUsIhUiMBBsan4v1M0PI7funcgfHEECv11tDFJfX+J6TFt/Q7TGCwS J+zxvsNHOf2ymMcvx0gxbh2MeXx9XzhrIKzImjI/aVkvU018in9YEtbXgYUaAGj7Aygu b1YJe6SCvKAncDwJDnYk1jZqJOT+DF6QYdS+kZNGJ/J5vJ6+ibpMx/GMCMl66WePfTEO A7ExIRU0Uc77Tw27CvSfMK1wFcaQGkXahm9+eYs7mVkfASrjVC79p02DEWh5HWan2Zxm 69624dn+hO6nPK40Omuhk2xM2Kz1KmYbHJVzAT10gmB6JTPxF4I0dxMbleYCH/OK/UIZ jH+Q== 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=gr0eKrk4K/BYOP1u+/BzgsKv0MAbRZ7OTW4YmnTfTpo=; b=cVPuBkxyKAebTWiZYZKmhtXGHvVKgbpbstArW3DwPylh7Nqcym2AqV9Ba1IN9IQoQh aPdlJcdBdN1h55b4Hfgyi1Jr2fqLW+1JRxxLKbfFYvvS3qv4Z5+o1xpbALn5jWvkyCM/ ev2TPHvK1rA/L5b4Bj02qhHb7sQDMaWKRzIs1MciplqLPIr3fPWZMVKTgD6A6pCie+Hu 8CVWverkFfQXAMTDiDr1aCAbPLYg0rnqhwLD3hQctYYSoDONjyJYctcDtfigw4DFiKuJ j7p0wvY25mvO6BUHIDF4ullBmiS4N2Rigk6jVSfQtj6kzgUzGZFZRda0sGEHWFXjE9ib EpVQ== X-Gm-Message-State: AOAM531RxtaLdQZupX3tDnuMoZqHI8PLhZ8DJYAYw4OnYR0CLLypMywE q1spaHyuXW+SFBRHpSalkBp7wxhvk7A= X-Google-Smtp-Source: ABdhPJwp0+ysAWLR45EfHY2LZA5ls6JeqwQyVvbTyL5YVCFTUwXxVo20TNi69t9Q2n4Zefb/X5wYAg== X-Received: by 2002:a05:6830:2106:: with SMTP id i6mr4707996otc.260.1613025829737; Wed, 10 Feb 2021 22:43:49 -0800 (PST) Received: from pear.attlocal.net ([2600:1700:271:1a80:302d:c724:5317:9751]) by smtp.gmail.com with ESMTPSA id y65sm993375oie.50.2021.02.10.22.43.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Feb 2021 22:43:49 -0800 (PST) From: Lijun Pan To: netdev@vger.kernel.org Cc: Lijun Pan Subject: [PATCH net-next v2 8/8] ibmvnic: prefer strscpy over strlcpy Date: Thu, 11 Feb 2021 00:43:25 -0600 Message-Id: <20210211064325.80591-9-lijunp213@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210211064325.80591-1-lijunp213@gmail.com> References: <20210211064325.80591-1-lijunp213@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix this warning: WARNING: Prefer strscpy over strlcpy - see: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/ Signed-off-by: Lijun Pan --- drivers/net/ethernet/ibm/ibmvnic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 778e56e05cd7..1774fbaab146 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -2633,9 +2633,9 @@ static void ibmvnic_get_drvinfo(struct net_device *netdev, { struct ibmvnic_adapter *adapter = netdev_priv(netdev); - strlcpy(info->driver, ibmvnic_driver_name, sizeof(info->driver)); - strlcpy(info->version, IBMVNIC_DRIVER_VERSION, sizeof(info->version)); - strlcpy(info->fw_version, adapter->fw_version, + strscpy(info->driver, ibmvnic_driver_name, sizeof(info->driver)); + strscpy(info->version, IBMVNIC_DRIVER_VERSION, sizeof(info->version)); + strscpy(info->fw_version, adapter->fw_version, sizeof(info->fw_version)); }