From patchwork Sun Aug 22 13:52:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 501767 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=-14.2 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_SANE_1 autolearn=unavailable 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 81187C4320E for ; Sun, 22 Aug 2021 14:01:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 685326135E for ; Sun, 22 Aug 2021 14:01:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233299AbhHVOCM (ORCPT ); Sun, 22 Aug 2021 10:02:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232791AbhHVOCH (ORCPT ); Sun, 22 Aug 2021 10:02:07 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E288C061756; Sun, 22 Aug 2021 07:01:26 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id k8so21969406wrn.3; Sun, 22 Aug 2021 07:01:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=69OYe9tROd3vXXnhUMU2DDb1J6uc6lcFtD6g0FYBe9o=; b=loDZL3yDasHCEoYfQOwAoMH6LusUl/iTl9I8gl+M2A2LUT4fnGNZ/YrngCVGP7uRdV Gattc73fzDLtCzW/jjwcEbo5HTK+guXwHIKyvlJpJb/D0hooJq0lSBk2/JGPPxlNMdH7 HwlmPZDRIp1spurh9ReQSAhc0CTiV8xQgdFalL1M1aFVrAH+LPnlgbuHLWXMDMep8v4o NjmXMrDmOhorccbXStmOpHUhv743yVZei+LfHQ2PH/3P7jPatdoMhkWnvF9d++WFchoB 2HmQTTuAOHJc5Mjajmyg5ybfSNCG4rRxwNqUlRYmTf/bYLT2YxpiX36hz9skqJ1qjv03 F7kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=69OYe9tROd3vXXnhUMU2DDb1J6uc6lcFtD6g0FYBe9o=; b=cOLqrw4p5427ZglzydQAS6ocb9dCl5RSVBTaBWW6CTtJVxyVKQbQFbylnYOPwQ1Zoo c87HPpa0dB2h4TVa2aj0vCLVfLtgQYFWuA6IVe7wARrOb93Lh6NjA9CT18sz4FSILE5o R6ExdyqA/hgORj9k1kRHFj8O09JVW2pJYugkc8wYyurtML1uJoZK0eXN7YDwEvwtE+Xg GsePWXKNnbaRvFYao2o9j5sy5zaJ5aguZjBNa069A76YuQFUgtDxkUyGVYCoXjAGxLk9 dRjwf4oPLgyvj5tSv+nnxmTc0JqWJSQziwsbw3Pd6j2RQlQrVPAjHt+xrFYVuHKhhBN+ zUlg== X-Gm-Message-State: AOAM531bb4EIvwd5I1N8Mscj06VIromdvBo+1+aK8xVrVDg6fjk9anI1 BS6+0owKPy2DPe4N6FXkt2k41sWasu4sMw== X-Google-Smtp-Source: ABdhPJyIK5Ebc6yicAPcW76i5P1gkw0vuBCxEf/WqTLVvVInH6ty65SP9yFNraKXLnfRjkfgvxYSkw== X-Received: by 2002:a5d:6483:: with SMTP id o3mr8801278wri.197.1629640884832; Sun, 22 Aug 2021 07:01:24 -0700 (PDT) Received: from ?IPv6:2003:ea:8f08:4500:fc53:5e22:f926:c43b? (p200300ea8f084500fc535e22f926c43b.dip0.t-ipconnect.de. [2003:ea:8f08:4500:fc53:5e22:f926:c43b]) by smtp.googlemail.com with ESMTPSA id o14sm12033206wrw.17.2021.08.22.07.01.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 22 Aug 2021 07:01:24 -0700 (PDT) Subject: [PATCH 04/12] bnx2: Replace open-coded version with swab32s() From: Heiner Kallweit To: Bjorn Helgaas , Rasesh Mody , GR-Linux-NIC-Dev@marvell.com, Jakub Kicinski , David Miller Cc: "linux-pci@vger.kernel.org" , SCSI development list , "netdev@vger.kernel.org" References: <1ca29408-7bc7-4da5-59c7-87893c9e0442@gmail.com> Message-ID: Date: Sun, 22 Aug 2021 15:52:01 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <1ca29408-7bc7-4da5-59c7-87893c9e0442@gmail.com> Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use swab32s() instead of open-coding it. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/broadcom/bnx2.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index de1a60a95..599fc1436 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -8041,21 +8041,16 @@ bnx2_read_vpd_fw_ver(struct bnx2 *bp) #define BNX2_VPD_LEN 128 #define BNX2_MAX_VER_SLEN 30 - data = kmalloc(256, GFP_KERNEL); + data = kmalloc(BNX2_VPD_LEN, GFP_KERNEL); if (!data) return; - rc = bnx2_nvram_read(bp, BNX2_VPD_NVRAM_OFFSET, data + BNX2_VPD_LEN, - BNX2_VPD_LEN); + rc = bnx2_nvram_read(bp, BNX2_VPD_NVRAM_OFFSET, data, BNX2_VPD_LEN); if (rc) goto vpd_done; - for (i = 0; i < BNX2_VPD_LEN; i += 4) { - data[i] = data[i + BNX2_VPD_LEN + 3]; - data[i + 1] = data[i + BNX2_VPD_LEN + 2]; - data[i + 2] = data[i + BNX2_VPD_LEN + 1]; - data[i + 3] = data[i + BNX2_VPD_LEN]; - } + for (i = 0; i < BNX2_VPD_LEN; i += 4) + swab32s((u32 *)&data[i]); j = pci_vpd_find_ro_info_keyword(data, BNX2_VPD_LEN, PCI_VPD_RO_KEYWORD_MFR_ID, &len);