diff options
Diffstat (limited to 'drivers/ieee1394/ohci1394.c')
-rw-r--r-- | drivers/ieee1394/ohci1394.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 6e8ea9110c46..eae97d8dcf03 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c | |||
@@ -1225,7 +1225,7 @@ static int ohci_iso_recv_init(struct hpsb_iso *iso) | |||
1225 | int ctx; | 1225 | int ctx; |
1226 | int ret = -ENOMEM; | 1226 | int ret = -ENOMEM; |
1227 | 1227 | ||
1228 | recv = kmalloc(sizeof(*recv), SLAB_KERNEL); | 1228 | recv = kmalloc(sizeof(*recv), GFP_KERNEL); |
1229 | if (!recv) | 1229 | if (!recv) |
1230 | return -ENOMEM; | 1230 | return -ENOMEM; |
1231 | 1231 | ||
@@ -1918,7 +1918,7 @@ static int ohci_iso_xmit_init(struct hpsb_iso *iso) | |||
1918 | int ctx; | 1918 | int ctx; |
1919 | int ret = -ENOMEM; | 1919 | int ret = -ENOMEM; |
1920 | 1920 | ||
1921 | xmit = kmalloc(sizeof(*xmit), SLAB_KERNEL); | 1921 | xmit = kmalloc(sizeof(*xmit), GFP_KERNEL); |
1922 | if (!xmit) | 1922 | if (!xmit) |
1923 | return -ENOMEM; | 1923 | return -ENOMEM; |
1924 | 1924 | ||
@@ -3021,7 +3021,7 @@ alloc_dma_rcv_ctx(struct ti_ohci *ohci, struct dma_rcv_ctx *d, | |||
3021 | return -ENOMEM; | 3021 | return -ENOMEM; |
3022 | } | 3022 | } |
3023 | 3023 | ||
3024 | d->prg_cpu[i] = pci_pool_alloc(d->prg_pool, SLAB_KERNEL, d->prg_bus+i); | 3024 | d->prg_cpu[i] = pci_pool_alloc(d->prg_pool, GFP_KERNEL, d->prg_bus+i); |
3025 | OHCI_DMA_ALLOC("pool dma_rcv prg[%d]", i); | 3025 | OHCI_DMA_ALLOC("pool dma_rcv prg[%d]", i); |
3026 | 3026 | ||
3027 | if (d->prg_cpu[i] != NULL) { | 3027 | if (d->prg_cpu[i] != NULL) { |
@@ -3117,7 +3117,7 @@ alloc_dma_trm_ctx(struct ti_ohci *ohci, struct dma_trm_ctx *d, | |||
3117 | OHCI_DMA_ALLOC("dma_rcv prg pool"); | 3117 | OHCI_DMA_ALLOC("dma_rcv prg pool"); |
3118 | 3118 | ||
3119 | for (i = 0; i < d->num_desc; i++) { | 3119 | for (i = 0; i < d->num_desc; i++) { |
3120 | d->prg_cpu[i] = pci_pool_alloc(d->prg_pool, SLAB_KERNEL, d->prg_bus+i); | 3120 | d->prg_cpu[i] = pci_pool_alloc(d->prg_pool, GFP_KERNEL, d->prg_bus+i); |
3121 | OHCI_DMA_ALLOC("pool dma_trm prg[%d]", i); | 3121 | OHCI_DMA_ALLOC("pool dma_trm prg[%d]", i); |
3122 | 3122 | ||
3123 | if (d->prg_cpu[i] != NULL) { | 3123 | if (d->prg_cpu[i] != NULL) { |