Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1653469pxp; Thu, 17 Mar 2022 13:41:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+pQePZpSAAMOZeKJZUdZrztvlgQeeJF7zI7JVtDinByYe5XvT9Jpn5a39vcSTaxezMaTN X-Received: by 2002:a17:902:b614:b0:151:f034:4058 with SMTP id b20-20020a170902b61400b00151f0344058mr6885393pls.84.1647549690045; Thu, 17 Mar 2022 13:41:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647549690; cv=none; d=google.com; s=arc-20160816; b=uadVJFQ7+RXuk5W/M5Wx2O5EShFI2JEaRxtaIbJI3vk9qgar5mdczgGaakfJJMx2Ou J1+lr8Tj5VdeyfdjWgXW8Ux1EQVWxToFTLFMgpoio14illZVXhRkH+3yxDKnsqMmhlH6 xdLg2ZBGkV1LafXRpfE83gnmvO68VUpz4gBUPhXv6N0SS/qShM+gCnDgrjdSQwSiE6IV VuyS7kjJqnSwTcKbBAPSYNYmdBAZqtfLZW+OQ2WW6yLLfeWJknniT2NsA404jAAJju1S LLlIpSFm2Pj+SXyQx/aRPjpgwtYmcx5onPAcE/IYEC8PVJCo8mkQQ6eYDcHA9OkfjCer p6Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lKrEoGyaV/hQS6y1z8JBbHrh7/KJC4dDkoBVdnxX1fg=; b=AUelvlOF/6KZyOG8xLxqEOiMPoLRWgtflOFhPiotDTSjc2Qm+1LUnwtUX7wZmzn1am AlD2FOrHqqP0CTx6UhsrOmoe+ENeeczXGOUtFNkb/V/nI9KZIKS6u1RrdLnHrZ7Kv1ir zvJ6WQ9N1kJSdIdxSN986RpU0N2FZdVvdS2rs0zf4fW85cFw0aobBpNrlF+p9cAtarPY hezqOnuL7r6VlAH+M4MEjm6sY6cnqug5WQSxizMtjSKs92cVMmYEvHENOovdOBWiCBgN VFCgkx9qGX+9opt75PFr6WOmbckv+/GxSY24jg4flFbLN3XmFagCj9+ePNf1LKqrha9W 3Pqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="W7+R/DRr"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id ks4-20020a17090b328400b001bf05af44e1si8472648pjb.82.2022.03.17.13.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 13:41:30 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="W7+R/DRr"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DA7A12E5745; Thu, 17 Mar 2022 13:09:50 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234052AbiCQMvh (ORCPT + 99 others); Thu, 17 Mar 2022 08:51:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234037AbiCQMvA (ORCPT ); Thu, 17 Mar 2022 08:51:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07A631F2DC5; Thu, 17 Mar 2022 05:49:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1C2C2B81E5C; Thu, 17 Mar 2022 12:49:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C1D2C340E9; Thu, 17 Mar 2022 12:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1647521341; bh=S+C3nMEKcj//SPKl/o/lF689KSCYt2NX+QEWbw/d2CU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W7+R/DRrNsBK41d5ebO2kd5a/vAyZJVpPFMeN3LYjQ1xiN/7p2cQQZqU5KGg42LxN e9uop0pa/4+5zuLz/V36svbZBRB6ptfGT91sz8xpT4na0x3ojZyn0FDky5+K525vYB qRKZ51fmifQxFvHka4oSE5z9QSPYWwlE9EupqEww= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 42/43] bnx2: Fix an error message Date: Thu, 17 Mar 2022 13:45:53 +0100 Message-Id: <20220317124528.836870115@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220317124527.672236844@linuxfoundation.org> References: <20220317124527.672236844@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe JAILLET [ Upstream commit 8ccffe9ac3239e549beaa0a9d5e1a1eac94e866c ] Fix an error message and report the correct failing function. Signed-off-by: Christophe JAILLET Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnx2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index c3f67d8e1093..f53292eab9da 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -8231,7 +8231,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) rc = pci_set_consistent_dma_mask(pdev, persist_dma_mask); if (rc) { dev_err(&pdev->dev, - "pci_set_consistent_dma_mask failed, aborting\n"); + "dma_set_coherent_mask failed, aborting\n"); goto err_out_unmap; } } else if ((rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) { -- 2.34.1