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

Commit 2a4e2b87 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

rtc: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dca03a51

drivers/rtc/rtc-at91rm9200.c

+6 −6
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int at91_rtc_readtime(struct device *dev, struct rtc_time *tm) 
	tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year);

	tm->tm_year = tm->tm_year - 1900;



	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,

	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,

		1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,

		tm->tm_hour, tm->tm_min, tm->tm_sec);
@@ -97,7 +97,7 @@ static int at91_rtc_settime(struct device *dev, struct rtc_time *tm) 
{

	unsigned long cr;



	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,

	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,

		1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,

		tm->tm_hour, tm->tm_min, tm->tm_sec);
@@ -142,7 +142,7 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) 
	alrm->enabled = (at91_sys_read(AT91_RTC_IMR) & AT91_RTC_ALARM)

			? 1 : 0;



	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,

	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,

		1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,

		tm->tm_hour, tm->tm_min, tm->tm_sec);
@@ -178,7 +178,7 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) 
	if (alrm->enabled)

		at91_sys_write(AT91_RTC_IER, AT91_RTC_ALARM);



	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,

	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,

		at91_alarm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour,

		tm.tm_min, tm.tm_sec);
@@ -193,7 +193,7 @@ static int at91_rtc_ioctl(struct device *dev, unsigned int cmd, 
{

	int ret = 0;



	pr_debug("%s(): cmd=%08x, arg=%08lx.\n", __FUNCTION__, cmd, arg);

	pr_debug("%s(): cmd=%08x, arg=%08lx.\n", __func__, cmd, arg);



	switch (cmd) {

	case RTC_AIE_OFF:	/* alarm off */
@@ -265,7 +265,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id) 


		rtc_update_irq(rtc, 1, events);



		pr_debug("%s(): num=%ld, events=0x%02lx\n", __FUNCTION__,

		pr_debug("%s(): num=%ld, events=0x%02lx\n", __func__,

			events >> 8, events & 0x000000FF);



		return IRQ_HANDLED;

drivers/rtc/rtc-at91sam9.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *_rtc) 


	rtc_update_irq(rtc->rtcdev, 1, events);



	pr_debug("%s: num=%ld, events=0x%02lx\n", __FUNCTION__,

	pr_debug("%s: num=%ld, events=0x%02lx\n", __func__,

		events >> 8, events & 0x000000FF);



	return IRQ_HANDLED;

drivers/rtc/rtc-ds1302.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int ds1302_rtc_read_time(struct device *dev, struct rtc_time *tm) 


	dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, "

		"mday=%d, mon=%d, year=%d, wday=%d\n",

		__FUNCTION__,

		__func__,

		tm->tm_sec, tm->tm_min, tm->tm_hour,

		tm->tm_mday, tm->tm_mon + 1, tm->tm_year, tm->tm_wday);

drivers/rtc/rtc-ds1672.c

+7 −7
Original line number Diff line number Diff line
@@ -50,13 +50,13 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) 


	/* read date registers */

	if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {

		dev_err(&client->dev, "%s: read error\n", __FUNCTION__);

		dev_err(&client->dev, "%s: read error\n", __func__);

		return -EIO;

	}



	dev_dbg(&client->dev,

		"%s: raw read data - counters=%02x,%02x,%02x,%02x\n",

		__FUNCTION__, buf[0], buf[1], buf[2], buf[3]);

		__func__, buf[0], buf[1], buf[2], buf[3]);



	time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
@@ -64,7 +64,7 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) 


	dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "

		"mday=%d, mon=%d, year=%d, wday=%d\n",

		__FUNCTION__, tm->tm_sec, tm->tm_min, tm->tm_hour,

		__func__, tm->tm_sec, tm->tm_min, tm->tm_hour,

		tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);



	return 0;
@@ -84,7 +84,7 @@ static int ds1672_set_mmss(struct i2c_client *client, unsigned long secs) 


	xfer = i2c_master_send(client, buf, 6);

	if (xfer != 6) {

		dev_err(&client->dev, "%s: send: %d\n", __FUNCTION__, xfer);

		dev_err(&client->dev, "%s: send: %d\n", __func__, xfer);

		return -EIO;

	}
@@ -98,7 +98,7 @@ static int ds1672_set_datetime(struct i2c_client *client, struct rtc_time *tm) 
	dev_dbg(&client->dev,

		"%s: secs=%d, mins=%d, hours=%d, "

		"mday=%d, mon=%d, year=%d, wday=%d\n",

		__FUNCTION__,

		__func__,

		tm->tm_sec, tm->tm_min, tm->tm_hour,

		tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
@@ -133,7 +133,7 @@ static int ds1672_get_control(struct i2c_client *client, u8 *status) 


	/* read control register */

	if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {

		dev_err(&client->dev, "%s: read error\n", __FUNCTION__);

		dev_err(&client->dev, "%s: read error\n", __func__);

		return -EIO;

	}
@@ -199,7 +199,7 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind) 
	struct i2c_client *client;

	struct rtc_device *rtc;



	dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);

	dev_dbg(&adapter->dev, "%s\n", __func__);



	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {

		err = -ENODEV;

drivers/rtc/rtc-max6900.c

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int max6900_i2c_read_regs(struct i2c_client *client, u8 *buf) 
	rc = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));

	if (rc != ARRAY_SIZE(msgs)) {

		dev_err(&client->dev, "%s: register read failed\n",

			__FUNCTION__);

			__func__);

		return -EIO;

	}

	return 0;
@@ -150,7 +150,7 @@ static int max6900_i2c_write_regs(struct i2c_client *client, u8 const *buf) 


write_failed:

	dev_err(&client->dev, "%s: register write failed\n",

		__FUNCTION__);

		__func__);

	return -EIO;

}
@@ -214,7 +214,7 @@ static int max6900_i2c_clear_write_protect(struct i2c_client *client) 
	rc = i2c_smbus_write_byte_data (client, MAX6900_REG_CONTROL_WRITE, 0);

	if (rc < 0) {

		dev_err(&client->dev, "%s: control register write failed\n",

			__FUNCTION__);

			__func__);

		return -EIO;

	}

	return 0;