Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dmaengine: NO_IRQ removal from powerpc-only drivers

Browse source 
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>
This commit is contained in:
Michael Ellerman 2016-09-10 19:56:04 +10:00 • committed by Vinod Koul
parent 29b4817d40
commit aa570be6de
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/dma/bestcomm/bestcomm.c
View file

@ -82,7 +82,7 @@ bcom_task_alloc(int bd_count, int bd_size, int priv_size)
/* Get IRQ of that task */ /* Get IRQ of that task */
tsk->irq = irq_of_parse_and_map(bcom_eng->ofnode, tsk->tasknum); tsk->irq = irq_of_parse_and_map(bcom_eng->ofnode, tsk->tasknum);
if (tsk->irq == NO_IRQ) if (!tsk->irq)
goto error; goto error;
/* Init the BDs, if needed */ /* Init the BDs, if needed */
@ -104,7 +104,7 @@ bcom_task_alloc(int bd_count, int bd_size, int priv_size)
error: error:
if (tsk) { if (tsk) {
if (tsk->irq != NO_IRQ) if (tsk->irq)
irq_dispose_mapping(tsk->irq); irq_dispose_mapping(tsk->irq);
bcom_sram_free(tsk->bd); bcom_sram_free(tsk->bd);
kfree(tsk->cookie); kfree(tsk->cookie);

2
drivers/dma/fsl_raid.c
View file

@ -670,7 +670,7 @@ static int fsl_re_chan_probe(struct platform_device *ofdev,
/* read irq property from dts */ /* read irq property from dts */
chan->irq = irq_of_parse_and_map(np, 0); chan->irq = irq_of_parse_and_map(np, 0);
if (chan->irq == NO_IRQ) { if (!chan->irq) {
dev_err(dev, "No IRQ defined for JR %d\n", q); dev_err(dev, "No IRQ defined for JR %d\n", q);
ret = -ENODEV; ret = -ENODEV;
goto err_free; goto err_free;

12
drivers/dma/fsldma.c
View file

@ -1153,7 +1153,7 @@ static void fsldma_free_irqs(struct fsldma_device *fdev)
struct fsldma_chan *chan; struct fsldma_chan *chan;
int i; int i;
if (fdev->irq != NO_IRQ) { if (fdev->irq) {
dev_dbg(fdev->dev, "free per-controller IRQ\n"); dev_dbg(fdev->dev, "free per-controller IRQ\n");
free_irq(fdev->irq, fdev); free_irq(fdev->irq, fdev);
return; return;
@ -1161,7 +1161,7 @@ static void fsldma_free_irqs(struct fsldma_device *fdev)
for (i = 0; i < FSL_DMA_MAX_CHANS_PER_DEVICE; i++) { for (i = 0; i < FSL_DMA_MAX_CHANS_PER_DEVICE; i++) {
chan = fdev->chan[i]; chan = fdev->chan[i];
if (chan && chan->irq != NO_IRQ) { if (chan && chan->irq) {
chan_dbg(chan, "free per-channel IRQ\n"); chan_dbg(chan, "free per-channel IRQ\n");
free_irq(chan->irq, chan); free_irq(chan->irq, chan);
} }
@ -1175,7 +1175,7 @@ static int fsldma_request_irqs(struct fsldma_device *fdev)
int i; int i;
/* if we have a per-controller IRQ, use that */ /* if we have a per-controller IRQ, use that */
if (fdev->irq != NO_IRQ) { if (fdev->irq) {
dev_dbg(fdev->dev, "request per-controller IRQ\n"); dev_dbg(fdev->dev, "request per-controller IRQ\n");
ret = request_irq(fdev->irq, fsldma_ctrl_irq, IRQF_SHARED, ret = request_irq(fdev->irq, fsldma_ctrl_irq, IRQF_SHARED,
"fsldma-controller", fdev); "fsldma-controller", fdev);
@ -1188,7 +1188,7 @@ static int fsldma_request_irqs(struct fsldma_device *fdev)
if (!chan) if (!chan)
continue; continue;
if (chan->irq == NO_IRQ) { if (!chan->irq) {
chan_err(chan, "interrupts property missing in device tree\n"); chan_err(chan, "interrupts property missing in device tree\n");
ret = -ENODEV; ret = -ENODEV;
goto out_unwind; goto out_unwind;
@ -1211,7 +1211,7 @@ out_unwind:
if (!chan) if (!chan)
continue; continue;
if (chan->irq == NO_IRQ) if (!chan->irq)
continue; continue;
free_irq(chan->irq, chan); free_irq(chan->irq, chan);
@ -1311,7 +1311,7 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev,
list_add_tail(&chan->common.device_node, &fdev->common.channels); list_add_tail(&chan->common.device_node, &fdev->common.channels);
dev_info(fdev->dev, "#%d (%s), irq %d\n", chan->id, compatible, dev_info(fdev->dev, "#%d (%s), irq %d\n", chan->id, compatible,
chan->irq != NO_IRQ ? chan->irq : fdev->irq); chan->irq ? chan->irq : fdev->irq);
return 0; return 0;

4
drivers/dma/mpc512x_dma.c
View file

@ -926,7 +926,7 @@ static int mpc_dma_probe(struct platform_device *op)
} }
mdma->irq = irq_of_parse_and_map(dn, 0); mdma->irq = irq_of_parse_and_map(dn, 0);
if (mdma->irq == NO_IRQ) { if (!mdma->irq) {
dev_err(dev, "Error mapping IRQ!\n"); dev_err(dev, "Error mapping IRQ!\n");
retval = -EINVAL; retval = -EINVAL;
goto err; goto err;
@ -935,7 +935,7 @@ static int mpc_dma_probe(struct platform_device *op)
if (of_device_is_compatible(dn, "fsl,mpc8308-dma")) { if (of_device_is_compatible(dn, "fsl,mpc8308-dma")) {
mdma->is_mpc8308 = 1; mdma->is_mpc8308 = 1;
mdma->irq2 = irq_of_parse_and_map(dn, 1); mdma->irq2 = irq_of_parse_and_map(dn, 1);
if (mdma->irq2 == NO_IRQ) { if (!mdma->irq2) {
dev_err(dev, "Error mapping IRQ!\n"); dev_err(dev, "Error mapping IRQ!\n");
retval = -EINVAL; retval = -EINVAL;
goto err_dispose1; goto err_dispose1;

4
drivers/dma/ppc4xx/adma.c
View file

@ -3891,7 +3891,7 @@ static int ppc440spe_adma_setup_irqs(struct ppc440spe_adma_device *adev,
np = ofdev->dev.of_node; np = ofdev->dev.of_node;
if (adev->id != PPC440SPE_XOR_ID) { if (adev->id != PPC440SPE_XOR_ID) {
adev->err_irq = irq_of_parse_and_map(np, 1); adev->err_irq = irq_of_parse_and_map(np, 1);
if (adev->err_irq == NO_IRQ) { if (!adev->err_irq) {
dev_warn(adev->dev, "no err irq resource?\n"); dev_warn(adev->dev, "no err irq resource?\n");
*initcode = PPC_ADMA_INIT_IRQ2; *initcode = PPC_ADMA_INIT_IRQ2;
adev->err_irq = -ENXIO; adev->err_irq = -ENXIO;
@ -3902,7 +3902,7 @@ static int ppc440spe_adma_setup_irqs(struct ppc440spe_adma_device *adev,
} }
adev->irq = irq_of_parse_and_map(np, 0); adev->irq = irq_of_parse_and_map(np, 0);
if (adev->irq == NO_IRQ) { if (!adev->irq) {
dev_err(adev->dev, "no irq resource\n"); dev_err(adev->dev, "no irq resource\n");
*initcode = PPC_ADMA_INIT_IRQ1; *initcode = PPC_ADMA_INIT_IRQ1;
ret = -ENXIO; ret = -ENXIO;