diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2011-12-12 15:59:12 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-12-20 02:20:02 -0500 |
commit | 5e718a09e5cafc8922f3fe22206423449a2801c9 (patch) | |
tree | 58112caac5006690265ef5bc4cfacb92746c1230 /drivers/crypto | |
parent | 2cdba3cf6ffc1fbf880a6fbfa9e7bb757e3d6526 (diff) |
crypto: talitos - convert talitos_error to struct device
SEC2/3 h/w doesn't have a dedicated interrupt for errors,
and the only callsite for talitos_error has already done
the type conversion, so simplify talitos_error to take a
pointer to a struct device.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r-- | drivers/crypto/talitos.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 503d0d8a58f5..2d8c78901686 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c | |||
@@ -534,9 +534,8 @@ static void report_eu_error(struct device *dev, int ch, u32 desc_hdr) | |||
534 | /* | 534 | /* |
535 | * recover from error interrupts | 535 | * recover from error interrupts |
536 | */ | 536 | */ |
537 | static void talitos_error(unsigned long data, u32 isr, u32 isr_lo) | 537 | static void talitos_error(struct device *dev, u32 isr, u32 isr_lo) |
538 | { | 538 | { |
539 | struct device *dev = (struct device *)data; | ||
540 | struct talitos_private *priv = dev_get_drvdata(dev); | 539 | struct talitos_private *priv = dev_get_drvdata(dev); |
541 | unsigned int timeout = TALITOS_TIMEOUT; | 540 | unsigned int timeout = TALITOS_TIMEOUT; |
542 | int ch, error, reset_dev = 0, reset_ch = 0; | 541 | int ch, error, reset_dev = 0, reset_ch = 0; |
@@ -628,7 +627,7 @@ static irqreturn_t talitos_interrupt_##name(int irq, void *data) \ | |||
628 | out_be32(priv->reg + TALITOS_ICR_LO, isr_lo); \ | 627 | out_be32(priv->reg + TALITOS_ICR_LO, isr_lo); \ |
629 | \ | 628 | \ |
630 | if (unlikely((isr & ~TALITOS_ISR_4CHDONE) & ch_err_mask || isr_lo)) \ | 629 | if (unlikely((isr & ~TALITOS_ISR_4CHDONE) & ch_err_mask || isr_lo)) \ |
631 | talitos_error((unsigned long)data, isr, isr_lo); \ | 630 | talitos_error(dev, isr, isr_lo); \ |
632 | else \ | 631 | else \ |
633 | if (likely(isr & ch_done_mask)) { \ | 632 | if (likely(isr & ch_done_mask)) { \ |
634 | /* mask further done interrupts. */ \ | 633 | /* mask further done interrupts. */ \ |