diff options
Diffstat (limited to 'drivers/rapidio/devices/tsi721.c')
| -rw-r--r-- | drivers/rapidio/devices/tsi721.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c index bb655854713d..b64c56c33c3b 100644 --- a/drivers/rapidio/devices/tsi721.c +++ b/drivers/rapidio/devices/tsi721.c | |||
| @@ -1382,9 +1382,9 @@ static int tsi721_doorbell_init(struct tsi721_device *priv) | |||
| 1382 | INIT_WORK(&priv->idb_work, tsi721_db_dpc); | 1382 | INIT_WORK(&priv->idb_work, tsi721_db_dpc); |
| 1383 | 1383 | ||
| 1384 | /* Allocate buffer for inbound doorbells queue */ | 1384 | /* Allocate buffer for inbound doorbells queue */ |
| 1385 | priv->idb_base = dma_zalloc_coherent(&priv->pdev->dev, | 1385 | priv->idb_base = dma_alloc_coherent(&priv->pdev->dev, |
| 1386 | IDB_QSIZE * TSI721_IDB_ENTRY_SIZE, | 1386 | IDB_QSIZE * TSI721_IDB_ENTRY_SIZE, |
| 1387 | &priv->idb_dma, GFP_KERNEL); | 1387 | &priv->idb_dma, GFP_KERNEL); |
| 1388 | if (!priv->idb_base) | 1388 | if (!priv->idb_base) |
| 1389 | return -ENOMEM; | 1389 | return -ENOMEM; |
| 1390 | 1390 | ||
| @@ -1447,9 +1447,9 @@ static int tsi721_bdma_maint_init(struct tsi721_device *priv) | |||
| 1447 | regs = priv->regs + TSI721_DMAC_BASE(TSI721_DMACH_MAINT); | 1447 | regs = priv->regs + TSI721_DMAC_BASE(TSI721_DMACH_MAINT); |
| 1448 | 1448 | ||
| 1449 | /* Allocate space for DMA descriptors */ | 1449 | /* Allocate space for DMA descriptors */ |
| 1450 | bd_ptr = dma_zalloc_coherent(&priv->pdev->dev, | 1450 | bd_ptr = dma_alloc_coherent(&priv->pdev->dev, |
| 1451 | bd_num * sizeof(struct tsi721_dma_desc), | 1451 | bd_num * sizeof(struct tsi721_dma_desc), |
| 1452 | &bd_phys, GFP_KERNEL); | 1452 | &bd_phys, GFP_KERNEL); |
| 1453 | if (!bd_ptr) | 1453 | if (!bd_ptr) |
| 1454 | return -ENOMEM; | 1454 | return -ENOMEM; |
| 1455 | 1455 | ||
| @@ -1464,7 +1464,7 @@ static int tsi721_bdma_maint_init(struct tsi721_device *priv) | |||
| 1464 | sts_size = (bd_num >= TSI721_DMA_MINSTSSZ) ? | 1464 | sts_size = (bd_num >= TSI721_DMA_MINSTSSZ) ? |
| 1465 | bd_num : TSI721_DMA_MINSTSSZ; | 1465 | bd_num : TSI721_DMA_MINSTSSZ; |
| 1466 | sts_size = roundup_pow_of_two(sts_size); | 1466 | sts_size = roundup_pow_of_two(sts_size); |
| 1467 | sts_ptr = dma_zalloc_coherent(&priv->pdev->dev, | 1467 | sts_ptr = dma_alloc_coherent(&priv->pdev->dev, |
| 1468 | sts_size * sizeof(struct tsi721_dma_sts), | 1468 | sts_size * sizeof(struct tsi721_dma_sts), |
| 1469 | &sts_phys, GFP_KERNEL); | 1469 | &sts_phys, GFP_KERNEL); |
| 1470 | if (!sts_ptr) { | 1470 | if (!sts_ptr) { |
| @@ -1939,10 +1939,10 @@ static int tsi721_open_outb_mbox(struct rio_mport *mport, void *dev_id, | |||
| 1939 | 1939 | ||
| 1940 | /* Outbound message descriptor status FIFO allocation */ | 1940 | /* Outbound message descriptor status FIFO allocation */ |
| 1941 | priv->omsg_ring[mbox].sts_size = roundup_pow_of_two(entries + 1); | 1941 | priv->omsg_ring[mbox].sts_size = roundup_pow_of_two(entries + 1); |
| 1942 | priv->omsg_ring[mbox].sts_base = dma_zalloc_coherent(&priv->pdev->dev, | 1942 | priv->omsg_ring[mbox].sts_base = dma_alloc_coherent(&priv->pdev->dev, |
| 1943 | priv->omsg_ring[mbox].sts_size * | 1943 | priv->omsg_ring[mbox].sts_size * sizeof(struct tsi721_dma_sts), |
| 1944 | sizeof(struct tsi721_dma_sts), | 1944 | &priv->omsg_ring[mbox].sts_phys, |
| 1945 | &priv->omsg_ring[mbox].sts_phys, GFP_KERNEL); | 1945 | GFP_KERNEL); |
| 1946 | if (priv->omsg_ring[mbox].sts_base == NULL) { | 1946 | if (priv->omsg_ring[mbox].sts_base == NULL) { |
| 1947 | tsi_debug(OMSG, &priv->pdev->dev, | 1947 | tsi_debug(OMSG, &priv->pdev->dev, |
| 1948 | "ENOMEM for OB_MSG_%d status FIFO", mbox); | 1948 | "ENOMEM for OB_MSG_%d status FIFO", mbox); |
