diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-07-30 20:20:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-30 20:20:18 -0400 |
commit | a97a6f10771b90235b33c13a6db9279237a08422 (patch) | |
tree | 60f73c13805d3e9968ac734960505ab081173945 /drivers/net/irda/ma600-sir.c | |
parent | 1fa98174ba980b2826edd1e4632a17916dfdb4fa (diff) |
irda: replace __FUNCTION__ with __func__
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda/ma600-sir.c')
-rw-r--r-- | drivers/net/irda/ma600-sir.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/irda/ma600-sir.c b/drivers/net/irda/ma600-sir.c index 809906d94762..1ceed9cfb7c4 100644 --- a/drivers/net/irda/ma600-sir.c +++ b/drivers/net/irda/ma600-sir.c | |||
@@ -67,13 +67,13 @@ static struct dongle_driver ma600 = { | |||
67 | 67 | ||
68 | static int __init ma600_sir_init(void) | 68 | static int __init ma600_sir_init(void) |
69 | { | 69 | { |
70 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__); | 70 | IRDA_DEBUG(2, "%s()\n", __func__); |
71 | return irda_register_dongle(&ma600); | 71 | return irda_register_dongle(&ma600); |
72 | } | 72 | } |
73 | 73 | ||
74 | static void __exit ma600_sir_cleanup(void) | 74 | static void __exit ma600_sir_cleanup(void) |
75 | { | 75 | { |
76 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__); | 76 | IRDA_DEBUG(2, "%s()\n", __func__); |
77 | irda_unregister_dongle(&ma600); | 77 | irda_unregister_dongle(&ma600); |
78 | } | 78 | } |
79 | 79 | ||
@@ -88,7 +88,7 @@ static int ma600_open(struct sir_dev *dev) | |||
88 | { | 88 | { |
89 | struct qos_info *qos = &dev->qos; | 89 | struct qos_info *qos = &dev->qos; |
90 | 90 | ||
91 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__); | 91 | IRDA_DEBUG(2, "%s()\n", __func__); |
92 | 92 | ||
93 | sirdev_set_dtr_rts(dev, TRUE, TRUE); | 93 | sirdev_set_dtr_rts(dev, TRUE, TRUE); |
94 | 94 | ||
@@ -106,7 +106,7 @@ static int ma600_open(struct sir_dev *dev) | |||
106 | 106 | ||
107 | static int ma600_close(struct sir_dev *dev) | 107 | static int ma600_close(struct sir_dev *dev) |
108 | { | 108 | { |
109 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__); | 109 | IRDA_DEBUG(2, "%s()\n", __func__); |
110 | 110 | ||
111 | /* Power off dongle */ | 111 | /* Power off dongle */ |
112 | sirdev_set_dtr_rts(dev, FALSE, FALSE); | 112 | sirdev_set_dtr_rts(dev, FALSE, FALSE); |
@@ -176,7 +176,7 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed) | |||
176 | { | 176 | { |
177 | u8 byte; | 177 | u8 byte; |
178 | 178 | ||
179 | IRDA_DEBUG(2, "%s(), speed=%d (was %d)\n", __FUNCTION__, | 179 | IRDA_DEBUG(2, "%s(), speed=%d (was %d)\n", __func__, |
180 | speed, dev->speed); | 180 | speed, dev->speed); |
181 | 181 | ||
182 | /* dongle already reset, dongle and port at default speed (9600) */ | 182 | /* dongle already reset, dongle and port at default speed (9600) */ |
@@ -201,12 +201,12 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed) | |||
201 | sirdev_raw_read(dev, &byte, sizeof(byte)); | 201 | sirdev_raw_read(dev, &byte, sizeof(byte)); |
202 | if (byte != get_control_byte(speed)) { | 202 | if (byte != get_control_byte(speed)) { |
203 | IRDA_WARNING("%s(): bad control byte read-back %02x != %02x\n", | 203 | IRDA_WARNING("%s(): bad control byte read-back %02x != %02x\n", |
204 | __FUNCTION__, (unsigned) byte, | 204 | __func__, (unsigned) byte, |
205 | (unsigned) get_control_byte(speed)); | 205 | (unsigned) get_control_byte(speed)); |
206 | return -1; | 206 | return -1; |
207 | } | 207 | } |
208 | else | 208 | else |
209 | IRDA_DEBUG(2, "%s() control byte write read OK\n", __FUNCTION__); | 209 | IRDA_DEBUG(2, "%s() control byte write read OK\n", __func__); |
210 | #endif | 210 | #endif |
211 | 211 | ||
212 | /* Set DTR, Set RTS */ | 212 | /* Set DTR, Set RTS */ |
@@ -238,7 +238,7 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed) | |||
238 | 238 | ||
239 | int ma600_reset(struct sir_dev *dev) | 239 | int ma600_reset(struct sir_dev *dev) |
240 | { | 240 | { |
241 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__); | 241 | IRDA_DEBUG(2, "%s()\n", __func__); |
242 | 242 | ||
243 | /* Reset the dongle : set DTR low for 10 ms */ | 243 | /* Reset the dongle : set DTR low for 10 ms */ |
244 | sirdev_set_dtr_rts(dev, FALSE, TRUE); | 244 | sirdev_set_dtr_rts(dev, FALSE, TRUE); |