commit 8eb159cfb1e6be0f6a3ead2cae5d8ef1c16e7590
author Linux Build Service Account <lnxbuild@localhost> Thu Jul 25 14:52:06 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jul 25 14:52:05 2013 -0700
tree 548e56f61f06947acec43e355cfc059c778d2669
parent ebc27fdfccdc70f4e4453d0ab7c0c6ffaf6e7d38
parent 782abf769547c842367c9ddc4f9b5116bf6c1363

Merge "[SCSI] ufshcd-pltfrm: remove unnecessary dma_set_coherent_mask() call"

drivers/scsi/ufs/ufshcd-pltfrm.c

diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c
index 4bb4c87..5634caf 100644
--- a/drivers/scsi/ufs/ufshcd-pltfrm.c
+++ b/drivers/scsi/ufs/ufshcd-pltfrm.c
@@ -132,12 +132,6 @@
 		goto out_iounmap;
 	}
 
-	err = dma_set_coherent_mask(dev, dev->coherent_dma_mask);
-	if (err) {
-		dev_err(&pdev->dev, "set dma mask failed\n");
-		goto out_iounmap;
-	}
-
 	err = ufshcd_init(&pdev->dev, &hba, mmio_base, irq_res->start);
 	if (err) {
 		dev_err(&pdev->dev, "Intialization failed\n");