diff options
author | Basavaraj Natikar <Basavaraj.Natikar@amd.com> | 2021-09-23 14:29:28 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2021-09-27 10:01:44 +0200 |
commit | c45d2b54cc73c439ccc727baf241416dc5498722 (patch) | |
tree | 7a2a5632d8248fe8866fef3e3c48d4178a5a2a1b | |
parent | HID: amd_sfh: switch from 'pci_' to 'dma_' API (diff) | |
download | linux-c45d2b54cc73c439ccc727baf241416dc5498722.tar.xz linux-c45d2b54cc73c439ccc727baf241416dc5498722.zip |
HID: amd_sfh: Use dma_set_mask_and_coherent()
Use dma_set_mask_and_coherent() to set both the streaming and
coherent masks.
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c index 166dd6377e32..f984b9174c65 100644 --- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c +++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c @@ -245,10 +245,13 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i privdata->mmio = pcim_iomap_table(pdev)[2]; pci_set_master(pdev); - rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); + rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); if (rc) { - rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); - return rc; + rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (rc) { + dev_err(&pdev->dev, "failed to set DMA mask\n"); + return rc; + } } privdata->cl_data = devm_kzalloc(&pdev->dev, sizeof(struct amdtp_cl_data), GFP_KERNEL); |