UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (7508): media/common/ replace remaining __FUNCTION__ occurrences 

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Acked-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Harvey Harrison 2008-04-08 23:20:00 -03:00 committed by Mauro Carvalho Chehab
parent fc9d8ed418
commit 536a0b1195
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/common/saa7146_core.c
View File

@ -74,7 +74,7 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev,
if (err) { if (err) {
printk(KERN_ERR "%s: %s timed out while waiting for " printk(KERN_ERR "%s: %s timed out while waiting for "
"registers getting programmed\n", "registers getting programmed\n",
dev->name, __FUNCTION__); dev->name, __func__);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
msleep(1); msleep(1);
@ -89,7 +89,7 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev,
saa7146_read(dev, MC2); saa7146_read(dev, MC2);
if (err) { if (err) {
DEB_S(("%s: %s timed out while waiting for transfer " DEB_S(("%s: %s timed out while waiting for transfer "
"completion\n", dev->name, __FUNCTION__)); "completion\n", dev->name, __func__));
return -ETIMEDOUT; return -ETIMEDOUT;
} }
msleep(1); msleep(1);
@ -111,7 +111,7 @@ static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev,
if (!loops--) { if (!loops--) {
printk(KERN_ERR "%s: %s timed out while waiting for " printk(KERN_ERR "%s: %s timed out while waiting for "
"registers getting programmed\n", "registers getting programmed\n",
dev->name, __FUNCTION__); dev->name, __func__);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
udelay(1); udelay(1);
@ -125,7 +125,7 @@ static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev,
saa7146_read(dev, MC2); saa7146_read(dev, MC2);
if (!loops--) { if (!loops--) {
DEB_S(("%s: %s timed out while waiting for transfer " DEB_S(("%s: %s timed out while waiting for transfer "
"completion\n", dev->name, __FUNCTION__)); "completion\n", dev->name, __func__));
return -ETIMEDOUT; return -ETIMEDOUT;
} }
udelay(5); udelay(5);

6
drivers/media/common/saa7146_i2c.c
View File

@ -203,7 +203,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d
return -ERESTARTSYS; return -ERESTARTSYS;
printk(KERN_WARNING "%s %s [irq]: timed out waiting for end of xfer\n", printk(KERN_WARNING "%s %s [irq]: timed out waiting for end of xfer\n",
dev->name, __FUNCTION__); dev->name, __func__);
return -EIO; return -EIO;
} }
status = saa7146_read(dev, I2C_STATUS); status = saa7146_read(dev, I2C_STATUS);
@ -221,7 +221,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d
} }
if (time_after(jiffies,timeout)) { if (time_after(jiffies,timeout)) {
printk(KERN_WARNING "%s %s: timed out waiting for MC2\n", printk(KERN_WARNING "%s %s: timed out waiting for MC2\n",
dev->name, __FUNCTION__); dev->name, __func__);
return -EIO; return -EIO;
} }
} }
@ -238,7 +238,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d
* (no answer from nonexisistant device...) * (no answer from nonexisistant device...)
*/ */
printk(KERN_WARNING "%s %s [poll]: timed out waiting for end of xfer\n", printk(KERN_WARNING "%s %s [poll]: timed out waiting for end of xfer\n",
dev->name, __FUNCTION__); dev->name, __func__);
return -EIO; return -EIO;
} }
if (++trial < 50 && short_delay) if (++trial < 50 && short_delay)