diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-08-26 12:57:25 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-08-26 13:58:59 -0600 |
| commit | b5e55556182d2e43da035df1bffbd492c72a7994 (patch) | |
| tree | 53f0636e32e98fa861650e8b4378227c7dd21481 /drivers/ata/sata_inic162x.c | |
| parent | dcc02c19cc06bd7bc1b6db0aa0087a2b6eb05b94 (diff) | |
| download | linux-stable-b5e55556182d2e43da035df1bffbd492c72a7994.tar.gz linux-stable-b5e55556182d2e43da035df1bffbd492c72a7994.tar.bz2 linux-stable-b5e55556182d2e43da035df1bffbd492c72a7994.zip | |
libata: switch remaining drivers to use dma_set_mask_and_coherent
Use dma_set_mask_and_coherent instead of separate dma_set_mask and
dma_set_coherent_mask calls.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ata/sata_inic162x.c')
| -rw-r--r-- | drivers/ata/sata_inic162x.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c index 790968497dfe..7f99e23bff88 100644 --- a/drivers/ata/sata_inic162x.c +++ b/drivers/ata/sata_inic162x.c @@ -862,18 +862,12 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) } /* Set dma_mask. This devices doesn't support 64bit addressing. */ - rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); + rc = dma_set_mask_and_coherent(&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 = init_controller(hpriv->mmio_base, hpriv->cached_hctl); if (rc) { dev_err(&pdev->dev, "failed to initialize controller\n"); |