---

yaml --- r: 283303 b: refs/heads/master c: 5e718a0 h: refs/heads/master i: 283301: 9515ad4 283299: dd75a5d 283295: 49c7eb4 v: v3
git-mirror · Dec 20, 2011 · 5e13366 · 5e13366
1 parent f776093
commit 5e13366
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cdba3cf6ffc1fbf880a6fbfa9e7bb757e3d6526
+refs/heads/master: 5e718a09e5cafc8922f3fe22206423449a2801c9
diff --git a/trunk/drivers/crypto/talitos.c b/trunk/drivers/crypto/talitos.c
@@ -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. */		       \