crypto: talitos - convert talitos_error to struct device
authorKim Phillips <kim.phillips@freescale.com>
Mon, 12 Dec 2011 20:59:12 +0000 (14:59 -0600)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 20 Dec 2011 07:20:02 +0000 (15:20 +0800)
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>
drivers/crypto/talitos.c

index 503d0d8a58f53d6f676057dbfbf12413c0e3d738..2d8c7890168664778be01834c8911bb2f52c97bc 100644 (file)
@@ -534,9 +534,8 @@ static void report_eu_error(struct device *dev, int ch, u32 desc_hdr)
 /*
  * recover from error interrupts
  */
-static void talitos_error(unsigned long data, u32 isr, u32 isr_lo)
+static void talitos_error(struct device *dev, u32 isr, u32 isr_lo)
 {
-       struct device *dev = (struct device *)data;
        struct talitos_private *priv = dev_get_drvdata(dev);
        unsigned int timeout = TALITOS_TIMEOUT;
        int ch, error, reset_dev = 0, reset_ch = 0;
@@ -628,7 +627,7 @@ static irqreturn_t talitos_interrupt_##name(int irq, void *data)           \
        out_be32(priv->reg + TALITOS_ICR_LO, isr_lo);                          \
                                                                               \
        if (unlikely((isr & ~TALITOS_ISR_4CHDONE) & ch_err_mask || isr_lo))    \
-               talitos_error((unsigned long)data, isr, isr_lo);               \
+               talitos_error(dev, isr, isr_lo);                               \
        else                                                                   \
                if (likely(isr & ch_done_mask)) {                              \
                        /* mask further done interrupts. */                    \