diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2011-12-12 15:59:11 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-12-20 02:20:02 -0500 |
commit | 2cdba3cf6ffc1fbf880a6fbfa9e7bb757e3d6526 (patch) | |
tree | 66ad180a5165d471e504303a9495deb5ebc6a35a /drivers/crypto/talitos.c | |
parent | 0b2730d8d8b38e009607d5a094d48fcce73af547 (diff) |
crypto: talitos - remove NO_IRQ references
As prescribed by Linus:
https://lkml.org/lkml/2011/12/2/290
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/talitos.c')
-rw-r--r-- | drivers/crypto/talitos.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index d376cc7c5e8f..503d0d8a58f5 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c | |||
@@ -234,7 +234,7 @@ static int reset_device(struct device *dev) | |||
234 | && --timeout) | 234 | && --timeout) |
235 | cpu_relax(); | 235 | cpu_relax(); |
236 | 236 | ||
237 | if (priv->irq[1] != NO_IRQ) { | 237 | if (priv->irq[1]) { |
238 | mcr = TALITOS_MCR_RCA1 | TALITOS_MCR_RCA3; | 238 | mcr = TALITOS_MCR_RCA1 | TALITOS_MCR_RCA3; |
239 | setbits32(priv->reg + TALITOS_MCR, mcr); | 239 | setbits32(priv->reg + TALITOS_MCR, mcr); |
240 | } | 240 | } |
@@ -2581,13 +2581,13 @@ static int talitos_remove(struct platform_device *ofdev) | |||
2581 | kfree(priv->chan); | 2581 | kfree(priv->chan); |
2582 | 2582 | ||
2583 | for (i = 0; i < 2; i++) | 2583 | for (i = 0; i < 2; i++) |
2584 | if (priv->irq[i] != NO_IRQ) { | 2584 | if (priv->irq[i]) { |
2585 | free_irq(priv->irq[i], dev); | 2585 | free_irq(priv->irq[i], dev); |
2586 | irq_dispose_mapping(priv->irq[i]); | 2586 | irq_dispose_mapping(priv->irq[i]); |
2587 | } | 2587 | } |
2588 | 2588 | ||
2589 | tasklet_kill(&priv->done_task[0]); | 2589 | tasklet_kill(&priv->done_task[0]); |
2590 | if (priv->irq[1] != NO_IRQ) | 2590 | if (priv->irq[1]) |
2591 | tasklet_kill(&priv->done_task[1]); | 2591 | tasklet_kill(&priv->done_task[1]); |
2592 | 2592 | ||
2593 | iounmap(priv->reg); | 2593 | iounmap(priv->reg); |
@@ -2663,7 +2663,7 @@ static int talitos_probe_irq(struct platform_device *ofdev) | |||
2663 | int err; | 2663 | int err; |
2664 | 2664 | ||
2665 | priv->irq[0] = irq_of_parse_and_map(np, 0); | 2665 | priv->irq[0] = irq_of_parse_and_map(np, 0); |
2666 | if (priv->irq[0] == NO_IRQ) { | 2666 | if (!priv->irq[0]) { |
2667 | dev_err(dev, "failed to map irq\n"); | 2667 | dev_err(dev, "failed to map irq\n"); |
2668 | return -EINVAL; | 2668 | return -EINVAL; |
2669 | } | 2669 | } |
@@ -2671,7 +2671,7 @@ static int talitos_probe_irq(struct platform_device *ofdev) | |||
2671 | priv->irq[1] = irq_of_parse_and_map(np, 1); | 2671 | priv->irq[1] = irq_of_parse_and_map(np, 1); |
2672 | 2672 | ||
2673 | /* get the primary irq line */ | 2673 | /* get the primary irq line */ |
2674 | if (priv->irq[1] == NO_IRQ) { | 2674 | if (!priv->irq[1]) { |
2675 | err = request_irq(priv->irq[0], talitos_interrupt_4ch, 0, | 2675 | err = request_irq(priv->irq[0], talitos_interrupt_4ch, 0, |
2676 | dev_driver_string(dev), dev); | 2676 | dev_driver_string(dev), dev); |
2677 | goto primary_out; | 2677 | goto primary_out; |
@@ -2688,7 +2688,7 @@ static int talitos_probe_irq(struct platform_device *ofdev) | |||
2688 | if (err) { | 2688 | if (err) { |
2689 | dev_err(dev, "failed to request secondary irq\n"); | 2689 | dev_err(dev, "failed to request secondary irq\n"); |
2690 | irq_dispose_mapping(priv->irq[1]); | 2690 | irq_dispose_mapping(priv->irq[1]); |
2691 | priv->irq[1] = NO_IRQ; | 2691 | priv->irq[1] = 0; |
2692 | } | 2692 | } |
2693 | 2693 | ||
2694 | return err; | 2694 | return err; |
@@ -2697,7 +2697,7 @@ primary_out: | |||
2697 | if (err) { | 2697 | if (err) { |
2698 | dev_err(dev, "failed to request primary irq\n"); | 2698 | dev_err(dev, "failed to request primary irq\n"); |
2699 | irq_dispose_mapping(priv->irq[0]); | 2699 | irq_dispose_mapping(priv->irq[0]); |
2700 | priv->irq[0] = NO_IRQ; | 2700 | priv->irq[0] = 0; |
2701 | } | 2701 | } |
2702 | 2702 | ||
2703 | return err; | 2703 | return err; |
@@ -2723,7 +2723,7 @@ static int talitos_probe(struct platform_device *ofdev) | |||
2723 | if (err) | 2723 | if (err) |
2724 | goto err_out; | 2724 | goto err_out; |
2725 | 2725 | ||
2726 | if (priv->irq[1] == NO_IRQ) { | 2726 | if (!priv->irq[1]) { |
2727 | tasklet_init(&priv->done_task[0], talitos_done_4ch, | 2727 | tasklet_init(&priv->done_task[0], talitos_done_4ch, |
2728 | (unsigned long)dev); | 2728 | (unsigned long)dev); |
2729 | } else { | 2729 | } else { |
@@ -2784,7 +2784,7 @@ static int talitos_probe(struct platform_device *ofdev) | |||
2784 | 2784 | ||
2785 | for (i = 0; i < priv->num_channels; i++) { | 2785 | for (i = 0; i < priv->num_channels; i++) { |
2786 | priv->chan[i].reg = priv->reg + TALITOS_CH_STRIDE * (i + 1); | 2786 | priv->chan[i].reg = priv->reg + TALITOS_CH_STRIDE * (i + 1); |
2787 | if ((priv->irq[1] == NO_IRQ) || !(i & 1)) | 2787 | if (!priv->irq[1] || !(i & 1)) |
2788 | priv->chan[i].reg += TALITOS_CH_BASE_OFFSET; | 2788 | priv->chan[i].reg += TALITOS_CH_BASE_OFFSET; |
2789 | } | 2789 | } |
2790 | 2790 | ||