diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-08-26 12:57:22 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-08-26 13:58:58 -0600 |
| commit | 51872b6606eb52a5c8b82e79c644d352fdb41d04 (patch) | |
| tree | cd7b43f8a2f31cadccc0930229fadde50636f155 /drivers/ata/sata_nv.c | |
| parent | 496d4575e7ac57f4ee3457c10be214e6b3ce0bd0 (diff) | |
| download | lwn-51872b6606eb52a5c8b82e79c644d352fdb41d04.tar.gz lwn-51872b6606eb52a5c8b82e79c644d352fdb41d04.zip | |
sata_nv: use dma_set_mask_and_coherent
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>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ata/sata_nv.c')
| -rw-r--r-- | drivers/ata/sata_nv.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index b44b4b64354c..56946012d113 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c @@ -1122,14 +1122,10 @@ static int nv_adma_port_start(struct ata_port *ap) /* * Now that the legacy PRD and padding buffer are allocated we can - * try to raise the DMA mask to allocate the CPB/APRD table. + * raise the DMA mask to allocate the CPB/APRD table. */ - rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); - if (rc) { - rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); - if (rc) - return rc; - } + dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); + pp->adma_dma_mask = *dev->dma_mask; mem = dmam_alloc_coherent(dev, NV_ADMA_PORT_PRIV_DMA_SZ, |