HID: amd_sfh: Use dma_set_mask_and_coherent()
authorBasavaraj Natikar <Basavaraj.Natikar@amd.com>
Thu, 23 Sep 2021 12:29:28 +0000 (17:59 +0530)
committerJiri Kosina <jkosina@suse.cz>
Mon, 27 Sep 2021 08:01:44 +0000 (10:01 +0200)
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>
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c

index 166dd63..f984b91 100644 (file)
@@ -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);