diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-08-20 19:52:04 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 18:59:00 -0400 |
commit | b39d66a81fb4f5ab555f86a2e49f3714f8369a3d (patch) | |
tree | 20ffb096fe2781545ac3f77f07ebbb347234e111 /drivers/net/usb | |
parent | b514f6b6da3aedcf4eb6f0c69e910ae89ef4632f (diff) |
drivers/net: 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: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/mcs7830.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/pegasus.c | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index ca9d00c1194e..b5143509e8be 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c | |||
@@ -118,7 +118,7 @@ static void mcs7830_async_cmd_callback(struct urb *urb) | |||
118 | 118 | ||
119 | if (urb->status < 0) | 119 | if (urb->status < 0) |
120 | printk(KERN_DEBUG "%s() failed with %d\n", | 120 | printk(KERN_DEBUG "%s() failed with %d\n", |
121 | __FUNCTION__, urb->status); | 121 | __func__, urb->status); |
122 | 122 | ||
123 | kfree(req); | 123 | kfree(req); |
124 | usb_free_urb(urb); | 124 | usb_free_urb(urb); |
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 8c19307e5040..38b90e7a7ed3 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
@@ -119,7 +119,7 @@ static void ctrl_callback(struct urb *urb) | |||
119 | default: | 119 | default: |
120 | if (netif_msg_drv(pegasus) && printk_ratelimit()) | 120 | if (netif_msg_drv(pegasus) && printk_ratelimit()) |
121 | dev_dbg(&pegasus->intf->dev, "%s, status %d\n", | 121 | dev_dbg(&pegasus->intf->dev, "%s, status %d\n", |
122 | __FUNCTION__, urb->status); | 122 | __func__, urb->status); |
123 | } | 123 | } |
124 | pegasus->flags &= ~ETH_REGS_CHANGED; | 124 | pegasus->flags &= ~ETH_REGS_CHANGED; |
125 | wake_up(&pegasus->ctrl_wait); | 125 | wake_up(&pegasus->ctrl_wait); |
@@ -136,7 +136,7 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size, | |||
136 | if (!buffer) { | 136 | if (!buffer) { |
137 | if (netif_msg_drv(pegasus)) | 137 | if (netif_msg_drv(pegasus)) |
138 | dev_warn(&pegasus->intf->dev, "out of memory in %s\n", | 138 | dev_warn(&pegasus->intf->dev, "out of memory in %s\n", |
139 | __FUNCTION__); | 139 | __func__); |
140 | return -ENOMEM; | 140 | return -ENOMEM; |
141 | } | 141 | } |
142 | add_wait_queue(&pegasus->ctrl_wait, &wait); | 142 | add_wait_queue(&pegasus->ctrl_wait, &wait); |
@@ -224,7 +224,7 @@ static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size, | |||
224 | netif_device_detach(pegasus->net); | 224 | netif_device_detach(pegasus->net); |
225 | if (netif_msg_drv(pegasus)) | 225 | if (netif_msg_drv(pegasus)) |
226 | dev_err(&pegasus->intf->dev, "%s, status %d\n", | 226 | dev_err(&pegasus->intf->dev, "%s, status %d\n", |
227 | __FUNCTION__, ret); | 227 | __func__, ret); |
228 | goto out; | 228 | goto out; |
229 | } | 229 | } |
230 | 230 | ||
@@ -246,7 +246,7 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data) | |||
246 | if (!tmp) { | 246 | if (!tmp) { |
247 | if (netif_msg_drv(pegasus)) | 247 | if (netif_msg_drv(pegasus)) |
248 | dev_warn(&pegasus->intf->dev, "out of memory in %s\n", | 248 | dev_warn(&pegasus->intf->dev, "out of memory in %s\n", |
249 | __FUNCTION__); | 249 | __func__); |
250 | return -ENOMEM; | 250 | return -ENOMEM; |
251 | } | 251 | } |
252 | memcpy(tmp, &data, 1); | 252 | memcpy(tmp, &data, 1); |
@@ -277,7 +277,7 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data) | |||
277 | netif_device_detach(pegasus->net); | 277 | netif_device_detach(pegasus->net); |
278 | if (netif_msg_drv(pegasus) && printk_ratelimit()) | 278 | if (netif_msg_drv(pegasus) && printk_ratelimit()) |
279 | dev_err(&pegasus->intf->dev, "%s, status %d\n", | 279 | dev_err(&pegasus->intf->dev, "%s, status %d\n", |
280 | __FUNCTION__, ret); | 280 | __func__, ret); |
281 | goto out; | 281 | goto out; |
282 | } | 282 | } |
283 | 283 | ||
@@ -310,7 +310,7 @@ static int update_eth_regs_async(pegasus_t * pegasus) | |||
310 | netif_device_detach(pegasus->net); | 310 | netif_device_detach(pegasus->net); |
311 | if (netif_msg_drv(pegasus)) | 311 | if (netif_msg_drv(pegasus)) |
312 | dev_err(&pegasus->intf->dev, "%s, status %d\n", | 312 | dev_err(&pegasus->intf->dev, "%s, status %d\n", |
313 | __FUNCTION__, ret); | 313 | __func__, ret); |
314 | } | 314 | } |
315 | 315 | ||
316 | return ret; | 316 | return ret; |
@@ -341,7 +341,7 @@ static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd) | |||
341 | } | 341 | } |
342 | fail: | 342 | fail: |
343 | if (netif_msg_drv(pegasus)) | 343 | if (netif_msg_drv(pegasus)) |
344 | dev_warn(&pegasus->intf->dev, "%s failed\n", __FUNCTION__); | 344 | dev_warn(&pegasus->intf->dev, "%s failed\n", __func__); |
345 | 345 | ||
346 | return ret; | 346 | return ret; |
347 | } | 347 | } |
@@ -378,7 +378,7 @@ static int write_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 regd) | |||
378 | 378 | ||
379 | fail: | 379 | fail: |
380 | if (netif_msg_drv(pegasus)) | 380 | if (netif_msg_drv(pegasus)) |
381 | dev_warn(&pegasus->intf->dev, "%s failed\n", __FUNCTION__); | 381 | dev_warn(&pegasus->intf->dev, "%s failed\n", __func__); |
382 | return -ETIMEDOUT; | 382 | return -ETIMEDOUT; |
383 | } | 383 | } |
384 | 384 | ||
@@ -415,7 +415,7 @@ static int read_eprom_word(pegasus_t * pegasus, __u8 index, __u16 * retdata) | |||
415 | 415 | ||
416 | fail: | 416 | fail: |
417 | if (netif_msg_drv(pegasus)) | 417 | if (netif_msg_drv(pegasus)) |
418 | dev_warn(&pegasus->intf->dev, "%s failed\n", __FUNCTION__); | 418 | dev_warn(&pegasus->intf->dev, "%s failed\n", __func__); |
419 | return -ETIMEDOUT; | 419 | return -ETIMEDOUT; |
420 | } | 420 | } |
421 | 421 | ||
@@ -463,7 +463,7 @@ static int write_eprom_word(pegasus_t * pegasus, __u8 index, __u16 data) | |||
463 | return ret; | 463 | return ret; |
464 | fail: | 464 | fail: |
465 | if (netif_msg_drv(pegasus)) | 465 | if (netif_msg_drv(pegasus)) |
466 | dev_warn(&pegasus->intf->dev, "%s failed\n", __FUNCTION__); | 466 | dev_warn(&pegasus->intf->dev, "%s failed\n", __func__); |
467 | return -ETIMEDOUT; | 467 | return -ETIMEDOUT; |
468 | } | 468 | } |
469 | #endif /* PEGASUS_WRITE_EEPROM */ | 469 | #endif /* PEGASUS_WRITE_EEPROM */ |