summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/mesh.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index 82e01dbe90af..ec6940f2fcb3 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1915,8 +1915,8 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
1915 /* We use the PCI APIs for now until the generic one gets fixed 1915 /* We use the PCI APIs for now until the generic one gets fixed
1916 * enough or until we get some macio-specific versions 1916 * enough or until we get some macio-specific versions
1917 */ 1917 */
1918 dma_cmd_space = pci_zalloc_consistent(macio_get_pci_dev(mdev), 1918 dma_cmd_space = dma_zalloc_coherent(&macio_get_pci_dev(mdev)->dev,
1919 ms->dma_cmd_size, &dma_cmd_bus); 1919 ms->dma_cmd_size, &dma_cmd_bus, GFP_KERNEL);
1920 if (dma_cmd_space == NULL) { 1920 if (dma_cmd_space == NULL) {
1921 printk(KERN_ERR "mesh: can't allocate DMA table\n"); 1921 printk(KERN_ERR "mesh: can't allocate DMA table\n");
1922 goto out_unmap; 1922 goto out_unmap;
@@ -1974,7 +1974,7 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
1974 */ 1974 */
1975 mesh_shutdown(mdev); 1975 mesh_shutdown(mdev);
1976 set_mesh_power(ms, 0); 1976 set_mesh_power(ms, 0);
1977 pci_free_consistent(macio_get_pci_dev(mdev), ms->dma_cmd_size, 1977 dma_free_coherent(&macio_get_pci_dev(mdev)->dev, ms->dma_cmd_size,
1978 ms->dma_cmd_space, ms->dma_cmd_bus); 1978 ms->dma_cmd_space, ms->dma_cmd_bus);
1979 out_unmap: 1979 out_unmap:
1980 iounmap(ms->dma); 1980 iounmap(ms->dma);
@@ -2007,7 +2007,7 @@ static int mesh_remove(struct macio_dev *mdev)
2007 iounmap(ms->dma); 2007 iounmap(ms->dma);
2008 2008
2009 /* Free DMA commands memory */ 2009 /* Free DMA commands memory */
2010 pci_free_consistent(macio_get_pci_dev(mdev), ms->dma_cmd_size, 2010 dma_free_coherent(&macio_get_pci_dev(mdev)->dev, ms->dma_cmd_size,
2011 ms->dma_cmd_space, ms->dma_cmd_bus); 2011 ms->dma_cmd_space, ms->dma_cmd_bus);
2012 2012
2013 /* Release memory resources */ 2013 /* Release memory resources */