diff --git a/[refs] b/[refs]
index 1739da038ae4..8ed96c6351b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00c4cc67512ada1d195b8bf3ef1db1d6b3951605
+refs/heads/master: 4207700d9b238c2db1bcba47a23251c6024687b6
diff --git a/trunk/include/media/saa7146.h b/trunk/include/media/saa7146.h
index afa5ff6469b3..796bcf151a3a 100644
--- a/trunk/include/media/saa7146.h
+++ b/trunk/include/media/saa7146.h
@@ -42,20 +42,6 @@ extern unsigned int saa7146_debug;
 #define DEB_INT(x)  if (0!=(DEBUG_VARIABLE&0x20)) { DEBUG_PROLOG; printk x; } /* interrupt debug messages */
 #define DEB_CAP(x)  if (0!=(DEBUG_VARIABLE&0x40)) { DEBUG_PROLOG; printk x; } /* capture debug messages */
 
-#define SAA7146_IER_DISABLE(x,y) 					\
-	do { 								\
-		unsigned int flags; 					\
-		spin_lock_irqsave(&x->int_slock, flags); 		\
-		saa7146_write(x, IER, saa7146_read(x, IER) & ~(y));	\
-		spin_unlock_irqrestore(&x->int_slock, flags);		\
-	} while(0)
-#define SAA7146_IER_ENABLE(x,y)						\
-	do { 								\
-		unsigned int flags; 					\
-		spin_lock_irqsave(&x->int_slock, flags); 		\
-		saa7146_write(x, IER, saa7146_read(x, IER) | (y));	\
-		spin_unlock_irqrestore(&x->int_slock, flags);		\
-	} while(0)
 #define SAA7146_ISR_CLEAR(x,y) \
 	saa7146_write(x, ISR, (y));
 
@@ -451,4 +437,20 @@ int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop);
 #define SAA7146_I2C_BUS_BIT_RATE_80	(0x200)
 #define SAA7146_I2C_BUS_BIT_RATE_60	(0x300)
 
+static inline void SAA7146_IER_DISABLE(struct saa7146_dev *x, unsigned y)
+{
+	unsigned long flags;
+	spin_lock_irqsave(&x->int_slock, flags);
+	saa7146_write(x, IER, saa7146_read(x, IER) & ~y);
+	spin_unlock_irqrestore(&x->int_slock, flags);
+}
+
+static inline void SAA7146_IER_ENABLE(struct saa7146_dev *x, unsigned y)
+{
+	unsigned long flags;
+	spin_lock_irqsave(&x->int_slock, flags);
+	saa7146_write(x, IER, saa7146_read(x, IER) | y);
+	spin_unlock_irqrestore(&x->int_slock, flags);
+}
+
 #endif