Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C101AC433EF for ; Thu, 27 Jan 2022 21:52:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238450AbiA0Vws (ORCPT ); Thu, 27 Jan 2022 16:52:48 -0500 Received: from mga03.intel.com ([134.134.136.65]:32606 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243121AbiA0Vwn (ORCPT ); Thu, 27 Jan 2022 16:52:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643320363; x=1674856363; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KwzAe8TCD4Q3nurpMlO6mY6kbxyZvwR7hJ6X1zUJL1I=; b=B7uEZOOwFUebH7V/IBoVZ7937o2KJe4yp16ZmnGJZ5mjaHJizcLd0EJ5 t5X+zmVUQhaQCKWeDxwb8eTwOnEXQx/r+JksPYAW08a/Jk8c+QhW96/Xk 47Fp89WCxRQ4oSMvMOl825RF2IkwHy0RWo3V7ROHqC1Py6HEEN1b99tg9 tlVzGLkDmrJEQNJwOGQ3yo4GcNhlkp+2s5KL/XfqnZFbp/nqiVdV5SKUN bWDhBuKe55C5zuNKMP0/3KrORBKSXp9Y2hhgR+Xu37wz0nX9IfprTGg0w WBIlync3JsBhn6m/JMJVGZ8oGqPaH/kvvtfat1FmVMUEUIYNySrckf6jz g==; X-IronPort-AV: E=McAfee;i="6200,9189,10239"; a="246918943" X-IronPort-AV: E=Sophos;i="5.88,321,1635231600"; d="scan'208";a="246918943" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jan 2022 13:52:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,321,1635231600"; d="scan'208";a="625391777" Received: from anguy11-desk2.jf.intel.com ([10.166.244.147]) by fmsmga002.fm.intel.com with ESMTP; 27 Jan 2022 13:52:42 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org Cc: Christophe JAILLET , netdev@vger.kernel.org, anthony.l.nguyen@intel.com, sassmann@redhat.com, Christoph Hellwig , Alexander Lobakin , Gurucharan G Subject: [PATCH net-next 04/10] i40e: Remove useless DMA-32 fallback configuration Date: Thu, 27 Jan 2022 13:52:18 -0800 Message-Id: <20220127215224.422113-5-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220127215224.422113-1-anthony.l.nguyen@intel.com> References: <20220127215224.422113-1-anthony.l.nguyen@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Christophe JAILLET As stated in [1], dma_set_mask() with a 64-bit mask never fails if dev->dma_mask is non-NULL. So, if it fails, the 32 bits case will also fail for the same reason. Simplify code and remove some dead code accordingly. [1]: https://lkml.org/lkml/2021/6/7/398 Signed-off-by: Christophe JAILLET Reviewed-by: Christoph Hellwig Reviewed-by: Alexander Lobakin Tested-by: Gurucharan G Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/i40e/i40e_main.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index f70c478dafdb..c8834765c864 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -15322,12 +15322,9 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) /* set up for high or low dma */ err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); if (err) { - err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); - if (err) { - dev_err(&pdev->dev, - "DMA configuration failed: 0x%x\n", err); - goto err_dma; - } + dev_err(&pdev->dev, + "DMA configuration failed: 0x%x\n", err); + goto err_dma; } /* set up pci connections */ -- 2.31.1