Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 536a0b11 authored by Harvey Harrison's avatar Harvey Harrison Committed by Mauro Carvalho Chehab
Browse files

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



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Acked-by: default avatarOliver Endriss <o.endriss@gmx.de>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent fc9d8ed4

drivers/media/common/saa7146_core.c

+4 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev, 
		if (err) {

			printk(KERN_ERR "%s: %s timed out while waiting for "

					"registers getting programmed\n",

					dev->name, __FUNCTION__);

					dev->name, __func__);

			return -ETIMEDOUT;

		}

		msleep(1);
@@ -89,7 +89,7 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev, 
		saa7146_read(dev, MC2);

		if (err) {

			DEB_S(("%s: %s timed out while waiting for transfer "

				"completion\n",	dev->name, __FUNCTION__));

				"completion\n",	dev->name, __func__));

			return -ETIMEDOUT;

		}

		msleep(1);
@@ -111,7 +111,7 @@ static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev, 
		if (!loops--) {

			printk(KERN_ERR "%s: %s timed out while waiting for "

					"registers getting programmed\n",

					dev->name, __FUNCTION__);

					dev->name, __func__);

			return -ETIMEDOUT;

		}

		udelay(1);
@@ -125,7 +125,7 @@ static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev, 
		saa7146_read(dev, MC2);

		if (!loops--) {

			DEB_S(("%s: %s timed out while waiting for transfer "

				"completion\n", dev->name, __FUNCTION__));

				"completion\n", dev->name, __func__));

			return -ETIMEDOUT;

		}

		udelay(5);

drivers/media/common/saa7146_i2c.c

+3 −3
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d 
				return -ERESTARTSYS;



			printk(KERN_WARNING "%s %s [irq]: timed out waiting for end of xfer\n",

				dev->name, __FUNCTION__);

				dev->name, __func__);

			return -EIO;

		}

		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)) {

				printk(KERN_WARNING "%s %s: timed out waiting for MC2\n",

					dev->name, __FUNCTION__);

					dev->name, __func__);

				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...)

				 */

				printk(KERN_WARNING "%s %s [poll]: timed out waiting for end of xfer\n",

					dev->name, __FUNCTION__);

					dev->name, __func__);

				return -EIO;

			}

			if (++trial < 50 && short_delay)