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 8DA21C433EF for ; Thu, 27 Jan 2022 21:52:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240925AbiA0Vww (ORCPT ); Thu, 27 Jan 2022 16:52:52 -0500 Received: from mga03.intel.com ([134.134.136.65]:32612 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244206AbiA0Vwo (ORCPT ); Thu, 27 Jan 2022 16:52:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643320364; x=1674856364; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=c6/dqkmTwAMCwTSAKWCyRPzb4ScOVyxUL8Ha8ZwdVtk=; b=Z54SjeT5e3Ry+sEvaph7q26ff3qvRF7gazpCV7cfUYgFxSKj6JN5emqZ ti7sDKh0TEr2b8HOTHDQ28fd9a1JkcAKacpzT5q4rBX07ijR8t+ZEDJtp bzzbwGDLW5gT1D91DHE1ZiKG/nQiwpNeOeSPmLT0Rn80Q0O2vVxUWqd7J EER1JLh21P+Nfd2xnhoSrPb1bt8sCl0gutFpqasdu7b+oSNZsz3UReT6I Uqg3kMmECZtTihfchn1AzkDD8YFy5U9rn87RFfxGQxMhIMetkdFgLkQ+v VXnwzlpnKWFL5UVQJE0Z/bj7GMctSDXvGhI0EPeAxNyWPgGuO7VYbxKh0 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10239"; a="246918949" X-IronPort-AV: E=Sophos;i="5.88,321,1635231600"; d="scan'208";a="246918949" 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:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,321,1635231600"; d="scan'208";a="625391786" Received: from anguy11-desk2.jf.intel.com ([10.166.244.147]) by fmsmga002.fm.intel.com with ESMTP; 27 Jan 2022 13:52:43 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org Cc: Christophe JAILLET , netdev@vger.kernel.org, anthony.l.nguyen@intel.com, Christoph Hellwig , Alexander Lobakin , Gurucharan G Subject: [PATCH net-next 07/10] ice: Remove useless DMA-32 fallback configuration Date: Thu, 27 Jan 2022 13:52:21 -0800 Message-Id: <20220127215224.422113-8-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/ice/ice_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 30814435f779..f46af3b34074 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -4459,8 +4459,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) /* set up for high or low DMA */ err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)); - if (err) - err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)); if (err) { dev_err(dev, "DMA configuration failed: 0x%x\n", err); return err; -- 2.31.1