diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-03 19:08:34 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-25 00:16:55 -0400 |
commit | 441b62c1edb986827154768d89bbac0ba779984f (patch) | |
tree | 13724c22d1b190a36f0ddbba38554e6c66bea6af /drivers/usb/core/driver.c | |
parent | 14722ef4acedc643f0b78b7165ceff2d300dae4d (diff) |
USB: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/driver.c')
-rw-r--r-- | drivers/usb/core/driver.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index edc31e13e95e..1e56f1cfa6dc 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
@@ -157,7 +157,7 @@ static int usb_probe_device(struct device *dev) | |||
157 | struct usb_device *udev; | 157 | struct usb_device *udev; |
158 | int error = -ENODEV; | 158 | int error = -ENODEV; |
159 | 159 | ||
160 | dev_dbg(dev, "%s\n", __FUNCTION__); | 160 | dev_dbg(dev, "%s\n", __func__); |
161 | 161 | ||
162 | if (!is_usb_device(dev)) /* Sanity check */ | 162 | if (!is_usb_device(dev)) /* Sanity check */ |
163 | return error; | 163 | return error; |
@@ -194,7 +194,7 @@ static int usb_probe_interface(struct device *dev) | |||
194 | const struct usb_device_id *id; | 194 | const struct usb_device_id *id; |
195 | int error = -ENODEV; | 195 | int error = -ENODEV; |
196 | 196 | ||
197 | dev_dbg(dev, "%s\n", __FUNCTION__); | 197 | dev_dbg(dev, "%s\n", __func__); |
198 | 198 | ||
199 | if (is_usb_device(dev)) /* Sanity check */ | 199 | if (is_usb_device(dev)) /* Sanity check */ |
200 | return error; | 200 | return error; |
@@ -211,7 +211,7 @@ static int usb_probe_interface(struct device *dev) | |||
211 | if (!id) | 211 | if (!id) |
212 | id = usb_match_dynamic_id(intf, driver); | 212 | id = usb_match_dynamic_id(intf, driver); |
213 | if (id) { | 213 | if (id) { |
214 | dev_dbg(dev, "%s - got id\n", __FUNCTION__); | 214 | dev_dbg(dev, "%s - got id\n", __func__); |
215 | 215 | ||
216 | error = usb_autoresume_device(udev); | 216 | error = usb_autoresume_device(udev); |
217 | if (error) | 217 | if (error) |
@@ -793,7 +793,7 @@ static int usb_suspend_device(struct usb_device *udev, pm_message_t msg) | |||
793 | status = udriver->suspend(udev, msg); | 793 | status = udriver->suspend(udev, msg); |
794 | 794 | ||
795 | done: | 795 | done: |
796 | dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status); | 796 | dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status); |
797 | return status; | 797 | return status; |
798 | } | 798 | } |
799 | 799 | ||
@@ -821,7 +821,7 @@ static int usb_resume_device(struct usb_device *udev) | |||
821 | status = udriver->resume(udev); | 821 | status = udriver->resume(udev); |
822 | 822 | ||
823 | done: | 823 | done: |
824 | dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status); | 824 | dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status); |
825 | if (status == 0) | 825 | if (status == 0) |
826 | udev->autoresume_disabled = 0; | 826 | udev->autoresume_disabled = 0; |
827 | return status; | 827 | return status; |
@@ -860,7 +860,7 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg) | |||
860 | } | 860 | } |
861 | 861 | ||
862 | done: | 862 | done: |
863 | dev_vdbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status); | 863 | dev_vdbg(&intf->dev, "%s: status %d\n", __func__, status); |
864 | return status; | 864 | return status; |
865 | } | 865 | } |
866 | 866 | ||
@@ -910,7 +910,7 @@ static int usb_resume_interface(struct usb_interface *intf, int reset_resume) | |||
910 | } | 910 | } |
911 | 911 | ||
912 | done: | 912 | done: |
913 | dev_vdbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status); | 913 | dev_vdbg(&intf->dev, "%s: status %d\n", __func__, status); |
914 | if (status == 0) | 914 | if (status == 0) |
915 | mark_active(intf); | 915 | mark_active(intf); |
916 | 916 | ||
@@ -1093,7 +1093,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) | |||
1093 | } | 1093 | } |
1094 | 1094 | ||
1095 | done: | 1095 | done: |
1096 | dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status); | 1096 | dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status); |
1097 | return status; | 1097 | return status; |
1098 | } | 1098 | } |
1099 | 1099 | ||
@@ -1187,7 +1187,7 @@ static int usb_resume_both(struct usb_device *udev) | |||
1187 | } | 1187 | } |
1188 | 1188 | ||
1189 | done: | 1189 | done: |
1190 | dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status); | 1190 | dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status); |
1191 | if (!status) | 1191 | if (!status) |
1192 | udev->reset_resume = 0; | 1192 | udev->reset_resume = 0; |
1193 | return status; | 1193 | return status; |
@@ -1257,7 +1257,7 @@ void usb_autosuspend_device(struct usb_device *udev) | |||
1257 | 1257 | ||
1258 | status = usb_autopm_do_device(udev, -1); | 1258 | status = usb_autopm_do_device(udev, -1); |
1259 | dev_vdbg(&udev->dev, "%s: cnt %d\n", | 1259 | dev_vdbg(&udev->dev, "%s: cnt %d\n", |
1260 | __FUNCTION__, udev->pm_usage_cnt); | 1260 | __func__, udev->pm_usage_cnt); |
1261 | } | 1261 | } |
1262 | 1262 | ||
1263 | /** | 1263 | /** |
@@ -1277,7 +1277,7 @@ void usb_try_autosuspend_device(struct usb_device *udev) | |||
1277 | { | 1277 | { |
1278 | usb_autopm_do_device(udev, 0); | 1278 | usb_autopm_do_device(udev, 0); |
1279 | dev_vdbg(&udev->dev, "%s: cnt %d\n", | 1279 | dev_vdbg(&udev->dev, "%s: cnt %d\n", |
1280 | __FUNCTION__, udev->pm_usage_cnt); | 1280 | __func__, udev->pm_usage_cnt); |
1281 | } | 1281 | } |
1282 | 1282 | ||
1283 | /** | 1283 | /** |
@@ -1305,7 +1305,7 @@ int usb_autoresume_device(struct usb_device *udev) | |||
1305 | 1305 | ||
1306 | status = usb_autopm_do_device(udev, 1); | 1306 | status = usb_autopm_do_device(udev, 1); |
1307 | dev_vdbg(&udev->dev, "%s: status %d cnt %d\n", | 1307 | dev_vdbg(&udev->dev, "%s: status %d cnt %d\n", |
1308 | __FUNCTION__, status, udev->pm_usage_cnt); | 1308 | __func__, status, udev->pm_usage_cnt); |
1309 | return status; | 1309 | return status; |
1310 | } | 1310 | } |
1311 | 1311 | ||
@@ -1377,7 +1377,7 @@ void usb_autopm_put_interface(struct usb_interface *intf) | |||
1377 | 1377 | ||
1378 | status = usb_autopm_do_interface(intf, -1); | 1378 | status = usb_autopm_do_interface(intf, -1); |
1379 | dev_vdbg(&intf->dev, "%s: status %d cnt %d\n", | 1379 | dev_vdbg(&intf->dev, "%s: status %d cnt %d\n", |
1380 | __FUNCTION__, status, intf->pm_usage_cnt); | 1380 | __func__, status, intf->pm_usage_cnt); |
1381 | } | 1381 | } |
1382 | EXPORT_SYMBOL_GPL(usb_autopm_put_interface); | 1382 | EXPORT_SYMBOL_GPL(usb_autopm_put_interface); |
1383 | 1383 | ||
@@ -1421,7 +1421,7 @@ int usb_autopm_get_interface(struct usb_interface *intf) | |||
1421 | 1421 | ||
1422 | status = usb_autopm_do_interface(intf, 1); | 1422 | status = usb_autopm_do_interface(intf, 1); |
1423 | dev_vdbg(&intf->dev, "%s: status %d cnt %d\n", | 1423 | dev_vdbg(&intf->dev, "%s: status %d cnt %d\n", |
1424 | __FUNCTION__, status, intf->pm_usage_cnt); | 1424 | __func__, status, intf->pm_usage_cnt); |
1425 | return status; | 1425 | return status; |
1426 | } | 1426 | } |
1427 | EXPORT_SYMBOL_GPL(usb_autopm_get_interface); | 1427 | EXPORT_SYMBOL_GPL(usb_autopm_get_interface); |
@@ -1443,7 +1443,7 @@ int usb_autopm_set_interface(struct usb_interface *intf) | |||
1443 | 1443 | ||
1444 | status = usb_autopm_do_interface(intf, 0); | 1444 | status = usb_autopm_do_interface(intf, 0); |
1445 | dev_vdbg(&intf->dev, "%s: status %d cnt %d\n", | 1445 | dev_vdbg(&intf->dev, "%s: status %d cnt %d\n", |
1446 | __FUNCTION__, status, intf->pm_usage_cnt); | 1446 | __func__, status, intf->pm_usage_cnt); |
1447 | return status; | 1447 | return status; |
1448 | } | 1448 | } |
1449 | EXPORT_SYMBOL_GPL(usb_autopm_set_interface); | 1449 | EXPORT_SYMBOL_GPL(usb_autopm_set_interface); |