From: Qing Wang <wangqing@vivo.com>
To: Gustavo Pimentel <gustavo.pimentel@synopsys.com>,
Vinod Koul <vkoul@kernel.org>, Viresh Kumar <vireshk@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Zhou Wang <wangzhou1@hisilicon.com>,
Logan Gunthorpe <logang@deltatee.com>,
Sathya Prakash <sathya.prakash@broadcom.com>,
Sreekanth Reddy <sreekanth.reddy@broadcom.com>,
Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>,
dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
MPT-FusionLinux.pdl@broadcom.com, linux-scsi@vger.kernel.org
Cc: Qing Wang <wangqing@vivo.com>
Subject: [PATCH V3 6/7] dma: dmaengine: switch from 'pci_' to 'dma_' API
Date: Thu, 7 Oct 2021 20:28:32 -0700 [thread overview]
Message-ID: <1633663733-47199-7-git-send-email-wangqing@vivo.com> (raw)
In-Reply-To: <1633663733-47199-1-git-send-email-wangqing@vivo.com>
The wrappers in include/linux/pci-dma-compat.h should go away.
pci_set_dma_mask()/pci_set_consistent_dma_mask() should be
replaced with dma_set_mask()/dma_set_coherent_mask(),
and use dma_set_mask_and_coherent() for both.
Signed-off-by: Qing Wang <wangqing@vivo.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
---
drivers/dma/plx_dma.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/dma/plx_dma.c b/drivers/dma/plx_dma.c
index 1669345..1ffcb5c
--- a/drivers/dma/plx_dma.c
+++ b/drivers/dma/plx_dma.c
@@ -563,15 +563,9 @@ static int plx_dma_probe(struct pci_dev *pdev,
if (rc)
return rc;
- rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(48));
+ rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
if (rc)
- rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
- if (rc)
- return rc;
-
- rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
- if (rc)
- rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+ rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (rc)
return rc;
--
2.7.4
next prev parent reply other threads:[~2021-10-08 3:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-08 3:28 [PATCH V3 0/7] switch from 'pci_' to 'dma_' API Qing Wang
2021-10-08 3:28 ` [PATCH V3 1/7] dma: dw-edma-pcie: " Qing Wang
2021-10-08 3:28 ` [PATCH V3 5/7] dma: ioat: " Qing Wang
2021-10-08 3:28 ` [PATCH V3 4/7] dma: hsu: " Qing Wang
2021-10-08 3:28 ` [PATCH V3 3/7] dma: hisi_dma: " Qing Wang
2021-10-08 3:28 ` [PATCH V3 2/7] dma: dw: " Qing Wang
2021-10-08 3:28 ` Qing Wang [this message]
2021-10-08 3:28 ` [PATCH V3 7/7] message: fusion: " Qing Wang
2021-10-25 6:55 ` [PATCH V3 0/7] " Vinod Koul
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=1633663733-47199-7-git-send-email-wangqing@vivo.com \
--to=wangqing@vivo.com \
--cc=MPT-FusionLinux.pdl@broadcom.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=gustavo.pimentel@synopsys.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=sathya.prakash@broadcom.com \
--cc=sreekanth.reddy@broadcom.com \
--cc=suganath-prabu.subramani@broadcom.com \
--cc=vireshk@kernel.org \
--cc=vkoul@kernel.org \
--cc=wangzhou1@hisilicon.com \
/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).