diff options
Diffstat (limited to 'drivers/media/common/saa7146_i2c.c')
-rw-r--r-- | drivers/media/common/saa7146_i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c index 7e7689afae62..35b01ec40a51 100644 --- a/drivers/media/common/saa7146_i2c.c +++ b/drivers/media/common/saa7146_i2c.c | |||
@@ -203,7 +203,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d | |||
203 | return -ERESTARTSYS; | 203 | return -ERESTARTSYS; |
204 | 204 | ||
205 | printk(KERN_WARNING "%s %s [irq]: timed out waiting for end of xfer\n", | 205 | printk(KERN_WARNING "%s %s [irq]: timed out waiting for end of xfer\n", |
206 | dev->name, __FUNCTION__); | 206 | dev->name, __func__); |
207 | return -EIO; | 207 | return -EIO; |
208 | } | 208 | } |
209 | status = saa7146_read(dev, I2C_STATUS); | 209 | status = saa7146_read(dev, I2C_STATUS); |
@@ -221,7 +221,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d | |||
221 | } | 221 | } |
222 | if (time_after(jiffies,timeout)) { | 222 | if (time_after(jiffies,timeout)) { |
223 | printk(KERN_WARNING "%s %s: timed out waiting for MC2\n", | 223 | printk(KERN_WARNING "%s %s: timed out waiting for MC2\n", |
224 | dev->name, __FUNCTION__); | 224 | dev->name, __func__); |
225 | return -EIO; | 225 | return -EIO; |
226 | } | 226 | } |
227 | } | 227 | } |
@@ -238,7 +238,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d | |||
238 | * (no answer from nonexisistant device...) | 238 | * (no answer from nonexisistant device...) |
239 | */ | 239 | */ |
240 | printk(KERN_WARNING "%s %s [poll]: timed out waiting for end of xfer\n", | 240 | printk(KERN_WARNING "%s %s [poll]: timed out waiting for end of xfer\n", |
241 | dev->name, __FUNCTION__); | 241 | dev->name, __func__); |
242 | return -EIO; | 242 | return -EIO; |
243 | } | 243 | } |
244 | if (++trial < 50 && short_delay) | 244 | if (++trial < 50 && short_delay) |