From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Mikael Pettersson <mikpelinux@gmail.com>
Cc: linux-ide@vger.kernel.org
Subject: [PATCH 7/8] sata_sil24: use dma_set_mask_and_coherent
Date: Mon, 26 Aug 2019 12:57:24 +0200 [thread overview]
Message-ID: <20190826105725.19405-8-hch@lst.de> (raw)
In-Reply-To: <20190826105725.19405-1-hch@lst.de>
Use the dma_set_mask_and_coherent helper to set the DMA mask. Rely
on the relatively recent change that setting a larger than required
mask will never fail to avoid the need for the boilerplate 32-bit
fallback code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/ata/sata_sil24.c | 26 ++++----------------------
1 file changed, 4 insertions(+), 22 deletions(-)
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 98aad8206921..7bef82de53ca 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -1301,28 +1301,10 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
host->iomap = iomap;
/* configure and activate the device */
- if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
- rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
- if (rc) {
- rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
- if (rc) {
- dev_err(&pdev->dev,
- "64-bit DMA enable failed\n");
- return rc;
- }
- }
- } else {
- rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
- if (rc) {
- dev_err(&pdev->dev, "32-bit DMA enable failed\n");
- return rc;
- }
- rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
- if (rc) {
- dev_err(&pdev->dev,
- "32-bit consistent DMA enable failed\n");
- return rc;
- }
+ rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
+ if (rc) {
+ dev_err(&pdev->dev, "DMA enable failed\n");
+ return rc;
}
/* Set max read request size to 4096. This slightly increases
--
2.20.1
next prev parent reply other threads:[~2019-08-26 10:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-26 10:57 libata dma_set_mask cleanups (resend) Christoph Hellwig
2019-08-26 10:57 ` [PATCH 1/8] acard_ahci: use dma_set_mask_and_coherent Christoph Hellwig
2019-08-26 10:57 ` [PATCH 2/8] ahci: " Christoph Hellwig
2019-08-26 10:57 ` [PATCH 3/8] pdc_adma: " Christoph Hellwig
2019-08-26 10:57 ` [PATCH 4/8] sata_mv: " Christoph Hellwig
2019-08-26 10:57 ` [PATCH 5/8] sata_nv: " Christoph Hellwig
2019-08-26 10:57 ` [PATCH 6/8] sata_qstor: " Christoph Hellwig
2019-08-26 10:57 ` Christoph Hellwig [this message]
2019-08-26 10:57 ` [PATCH 8/8] libata: switch remaining drivers to " Christoph Hellwig
2019-08-26 19:59 ` libata dma_set_mask cleanups (resend) Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2019-06-24 7:12 libata dma_set_mask cleanups Christoph Hellwig
2019-06-24 7:12 ` [PATCH 7/8] sata_sil24: use dma_set_mask_and_coherent Christoph Hellwig
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=20190826105725.19405-8-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=b.zolnierkie@samsung.com \
--cc=linux-ide@vger.kernel.org \
--cc=mikpelinux@gmail.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).