tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

dmaengine: NO_IRQ removal from powerpc-only drivers

We'd like to eventually remove NO_IRQ on powerpc, so remove usages of it
from powerpc-only drivers.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

authored by

Michael Ellerman and committed by
Vinod Koul aa570be6 29b4817d

+13 -13
+2 -2
drivers/dma/bestcomm/bestcomm.c
··· 82 82 83 83 /* Get IRQ of that task */ 84 84 tsk->irq = irq_of_parse_and_map(bcom_eng->ofnode, tsk->tasknum); 85 - if (tsk->irq == NO_IRQ) 85 + if (!tsk->irq) 86 86 goto error; 87 87 88 88 /* Init the BDs, if needed */ ··· 104 104 105 105 error: 106 106 if (tsk) { 107 - if (tsk->irq != NO_IRQ) 107 + if (tsk->irq) 108 108 irq_dispose_mapping(tsk->irq); 109 109 bcom_sram_free(tsk->bd); 110 110 kfree(tsk->cookie);
+1 -1
drivers/dma/fsl_raid.c
··· 670 670 671 671 /* read irq property from dts */ 672 672 chan->irq = irq_of_parse_and_map(np, 0); 673 - if (chan->irq == NO_IRQ) { 673 + if (!chan->irq) { 674 674 dev_err(dev, "No IRQ defined for JR %d\n", q); 675 675 ret = -ENODEV; 676 676 goto err_free;
+6 -6
drivers/dma/fsldma.c
··· 1153 1153 struct fsldma_chan *chan; 1154 1154 int i; 1155 1155 1156 - if (fdev->irq != NO_IRQ) { 1156 + if (fdev->irq) { 1157 1157 dev_dbg(fdev->dev, "free per-controller IRQ\n"); 1158 1158 free_irq(fdev->irq, fdev); 1159 1159 return; ··· 1161 1161 1162 1162 for (i = 0; i < FSL_DMA_MAX_CHANS_PER_DEVICE; i++) { 1163 1163 chan = fdev->chan[i]; 1164 - if (chan && chan->irq != NO_IRQ) { 1164 + if (chan && chan->irq) { 1165 1165 chan_dbg(chan, "free per-channel IRQ\n"); 1166 1166 free_irq(chan->irq, chan); 1167 1167 } ··· 1175 1175 int i; 1176 1176 1177 1177 /* if we have a per-controller IRQ, use that */ 1178 - if (fdev->irq != NO_IRQ) { 1178 + if (fdev->irq) { 1179 1179 dev_dbg(fdev->dev, "request per-controller IRQ\n"); 1180 1180 ret = request_irq(fdev->irq, fsldma_ctrl_irq, IRQF_SHARED, 1181 1181 "fsldma-controller", fdev); ··· 1188 1188 if (!chan) 1189 1189 continue; 1190 1190 1191 - if (chan->irq == NO_IRQ) { 1191 + if (!chan->irq) { 1192 1192 chan_err(chan, "interrupts property missing in device tree\n"); 1193 1193 ret = -ENODEV; 1194 1194 goto out_unwind; ··· 1211 1211 if (!chan) 1212 1212 continue; 1213 1213 1214 - if (chan->irq == NO_IRQ) 1214 + if (!chan->irq) 1215 1215 continue; 1216 1216 1217 1217 free_irq(chan->irq, chan); ··· 1311 1311 list_add_tail(&chan->common.device_node, &fdev->common.channels); 1312 1312 1313 1313 dev_info(fdev->dev, "#%d (%s), irq %d\n", chan->id, compatible, 1314 - chan->irq != NO_IRQ ? chan->irq : fdev->irq); 1314 + chan->irq ? chan->irq : fdev->irq); 1315 1315 1316 1316 return 0; 1317 1317
+2 -2
drivers/dma/mpc512x_dma.c
··· 926 926 } 927 927 928 928 mdma->irq = irq_of_parse_and_map(dn, 0); 929 - if (mdma->irq == NO_IRQ) { 929 + if (!mdma->irq) { 930 930 dev_err(dev, "Error mapping IRQ!\n"); 931 931 retval = -EINVAL; 932 932 goto err; ··· 935 935 if (of_device_is_compatible(dn, "fsl,mpc8308-dma")) { 936 936 mdma->is_mpc8308 = 1; 937 937 mdma->irq2 = irq_of_parse_and_map(dn, 1); 938 - if (mdma->irq2 == NO_IRQ) { 938 + if (!mdma->irq2) { 939 939 dev_err(dev, "Error mapping IRQ!\n"); 940 940 retval = -EINVAL; 941 941 goto err_dispose1;
+2 -2
drivers/dma/ppc4xx/adma.c
··· 3891 3891 np = ofdev->dev.of_node; 3892 3892 if (adev->id != PPC440SPE_XOR_ID) { 3893 3893 adev->err_irq = irq_of_parse_and_map(np, 1); 3894 - if (adev->err_irq == NO_IRQ) { 3894 + if (!adev->err_irq) { 3895 3895 dev_warn(adev->dev, "no err irq resource?\n"); 3896 3896 *initcode = PPC_ADMA_INIT_IRQ2; 3897 3897 adev->err_irq = -ENXIO; ··· 3902 3902 } 3903 3903 3904 3904 adev->irq = irq_of_parse_and_map(np, 0); 3905 - if (adev->irq == NO_IRQ) { 3905 + if (!adev->irq) { 3906 3906 dev_err(adev->dev, "no irq resource\n"); 3907 3907 *initcode = PPC_ADMA_INIT_IRQ1; 3908 3908 ret = -ENXIO;