diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-28 05:12:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:17 -0400 |
commit | 2a4e2b8780c6df42b19c053243dada7fa4d311ee (patch) | |
tree | 4970af3a9ee9c2a8b3e4861ac552cb9262acbaa0 /drivers/rtc/rtc-ds1672.c | |
parent | dca03a51549bc645685fb8a77efa64df531666c3 (diff) |
rtc: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-ds1672.c')
-rw-r--r-- | drivers/rtc/rtc-ds1672.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c index e0900ca678ec..6fa4556f5f5c 100644 --- a/drivers/rtc/rtc-ds1672.c +++ b/drivers/rtc/rtc-ds1672.c | |||
@@ -50,13 +50,13 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) | |||
50 | 50 | ||
51 | /* read date registers */ | 51 | /* read date registers */ |
52 | if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { | 52 | if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { |
53 | dev_err(&client->dev, "%s: read error\n", __FUNCTION__); | 53 | dev_err(&client->dev, "%s: read error\n", __func__); |
54 | return -EIO; | 54 | return -EIO; |
55 | } | 55 | } |
56 | 56 | ||
57 | dev_dbg(&client->dev, | 57 | dev_dbg(&client->dev, |
58 | "%s: raw read data - counters=%02x,%02x,%02x,%02x\n", | 58 | "%s: raw read data - counters=%02x,%02x,%02x,%02x\n", |
59 | __FUNCTION__, buf[0], buf[1], buf[2], buf[3]); | 59 | __func__, buf[0], buf[1], buf[2], buf[3]); |
60 | 60 | ||
61 | time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; | 61 | time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; |
62 | 62 | ||
@@ -64,7 +64,7 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) | |||
64 | 64 | ||
65 | dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, " | 65 | dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, " |
66 | "mday=%d, mon=%d, year=%d, wday=%d\n", | 66 | "mday=%d, mon=%d, year=%d, wday=%d\n", |
67 | __FUNCTION__, tm->tm_sec, tm->tm_min, tm->tm_hour, | 67 | __func__, tm->tm_sec, tm->tm_min, tm->tm_hour, |
68 | tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); | 68 | tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); |
69 | 69 | ||
70 | return 0; | 70 | return 0; |
@@ -84,7 +84,7 @@ static int ds1672_set_mmss(struct i2c_client *client, unsigned long secs) | |||
84 | 84 | ||
85 | xfer = i2c_master_send(client, buf, 6); | 85 | xfer = i2c_master_send(client, buf, 6); |
86 | if (xfer != 6) { | 86 | if (xfer != 6) { |
87 | dev_err(&client->dev, "%s: send: %d\n", __FUNCTION__, xfer); | 87 | dev_err(&client->dev, "%s: send: %d\n", __func__, xfer); |
88 | return -EIO; | 88 | return -EIO; |
89 | } | 89 | } |
90 | 90 | ||
@@ -98,7 +98,7 @@ static int ds1672_set_datetime(struct i2c_client *client, struct rtc_time *tm) | |||
98 | dev_dbg(&client->dev, | 98 | dev_dbg(&client->dev, |
99 | "%s: secs=%d, mins=%d, hours=%d, " | 99 | "%s: secs=%d, mins=%d, hours=%d, " |
100 | "mday=%d, mon=%d, year=%d, wday=%d\n", | 100 | "mday=%d, mon=%d, year=%d, wday=%d\n", |
101 | __FUNCTION__, | 101 | __func__, |
102 | tm->tm_sec, tm->tm_min, tm->tm_hour, | 102 | tm->tm_sec, tm->tm_min, tm->tm_hour, |
103 | tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); | 103 | tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); |
104 | 104 | ||
@@ -133,7 +133,7 @@ static int ds1672_get_control(struct i2c_client *client, u8 *status) | |||
133 | 133 | ||
134 | /* read control register */ | 134 | /* read control register */ |
135 | if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { | 135 | if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { |
136 | dev_err(&client->dev, "%s: read error\n", __FUNCTION__); | 136 | dev_err(&client->dev, "%s: read error\n", __func__); |
137 | return -EIO; | 137 | return -EIO; |
138 | } | 138 | } |
139 | 139 | ||
@@ -199,7 +199,7 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind) | |||
199 | struct i2c_client *client; | 199 | struct i2c_client *client; |
200 | struct rtc_device *rtc; | 200 | struct rtc_device *rtc; |
201 | 201 | ||
202 | dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); | 202 | dev_dbg(&adapter->dev, "%s\n", __func__); |
203 | 203 | ||
204 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { | 204 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { |
205 | err = -ENODEV; | 205 | err = -ENODEV; |