---

yaml --- r: 230332 b: refs/heads/master c: 48d78e5 h: refs/heads/master v: v3
git-mirror · Dec 3, 2010 · b153c47 · b153c47
1 parent 7f55035
commit b153c47
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7d711e3bb92fcf01ee14b7decf0059ac184efc2
+refs/heads/master: 48d78e5879b9f9e1beed341f6a30add127f43907
diff --git a/trunk/sound/soc/sh/fsi.c b/trunk/sound/soc/sh/fsi.c
@@ -221,21 +221,6 @@ static void fsi_reg_mask_set(struct fsi_priv *fsi, u32 reg, u32 mask, u32 data)
 	__fsi_reg_mask_set((u32)(fsi->base + reg), mask, data);
 }
 
-static void fsi_master_write(struct fsi_master *master, u32 reg, u32 data)
-{
-	unsigned long flags;
-
-	if ((reg < MREG_START) ||
-	    (reg > MREG_END)) {
-		pr_err("fsi: register access err (%s)\n", __func__);
-		return;
-	}
-
-	spin_lock_irqsave(&master->lock, flags);
-	__fsi_reg_write((u32)(master->base + reg), data);
-	spin_unlock_irqrestore(&master->lock, flags);
-}
-
 static u32 fsi_master_read(struct fsi_master *master, u32 reg)
 {
 	u32 ret;
@@ -500,11 +485,6 @@ static u32 fsi_irq_get_status(struct fsi_master *master)
 	return fsi_master_read(master, master->core->int_st);
 }
 
-static void fsi_irq_clear_all_status(struct fsi_master *master)
-{
-	fsi_master_write(master, master->core->int_st, 0);
-}
-
 static void fsi_irq_clear_status(struct fsi_priv *fsi)
 {
 	u32 data = 0;
@@ -756,7 +736,8 @@ static irqreturn_t fsi_interrupt(int irq, void *data)
 	if (int_st & AB_IO(1, BI_SHIFT))
 		fsi_data_pop(&master->fsib, 0);
 
-	fsi_irq_clear_all_status(master);
+	fsi_irq_clear_status(&master->fsia);
+	fsi_irq_clear_status(&master->fsib);
 
 	return IRQ_HANDLED;
 }