From: Heiner Kallweit <hkallweit1@gmail.com>
To: Luca Coelho <luciano.coelho@intel.com>,
Kalle Valo <kvalo@codeaurora.org>,
David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
linux-wireless <linux-wireless@vger.kernel.org>
Subject: [PATCH net-next 3/3] iwlwifi: use dma_set_mask_and_coherent
Date: Sun, 14 Mar 2021 20:43:36 +0100 [thread overview]
Message-ID: <26a13b6e-6fa8-6e34-1e08-37c9fd8e398f@gmail.com> (raw)
In-Reply-To: <22e63925-1469-2839-e4d3-c10d8658ba82@gmail.com>
Simplify the code by using dma_set_mask_and_coherent().
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 1bf4c37fe..4fd391dda 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3440,15 +3440,9 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
pci_set_master(pdev);
addr_size = trans->txqs.tfd.addr_size;
- ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(addr_size));
- if (!ret)
- ret = pci_set_consistent_dma_mask(pdev,
- DMA_BIT_MASK(addr_size));
+ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(addr_size));
if (ret) {
- ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
- if (!ret)
- ret = pci_set_consistent_dma_mask(pdev,
- DMA_BIT_MASK(32));
+ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
/* both attempts failed: */
if (ret) {
dev_err(&pdev->dev, "No suitable DMA available\n");
--
2.30.2
next prev parent reply other threads:[~2021-03-14 19:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-14 19:38 [PATCH net-next 0/3] iwlwifi: series with smaller improvements Heiner Kallweit
2021-03-14 19:40 ` [PATCH net-next 1/3] iwlwifi: use DECLARE_BITMAP macro Heiner Kallweit
2021-03-14 19:42 ` [PATCH net-next 2/3] iwlwifi: switch "index larger than supported by driver" warning to debug level Heiner Kallweit
2021-03-14 19:43 ` Heiner Kallweit [this message]
2021-03-15 5:39 ` [PATCH net-next 0/3] iwlwifi: series with smaller improvements Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=26a13b6e-6fa8-6e34-1e08-37c9fd8e398f@gmail.com \
--to=hkallweit1@gmail.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).