leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath6kl: Rename USB driver's suspend/resume/reset_resume

Browse Source 
Rename USB driver's suspend/resume/reset_resume callbacks
with 'pm' prefix. This is necessary to differentiate it from
cfg80211/hif suspend/resume/reset_resume callbacks.

Cc: Sivanesan Rajapupathi <c_srajap@qualcomm.com>
Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Mohammed Shafi Shajakhan 2013-05-15 10:22:10 +05:30 committed by Kalle Valo
parent ade9833074
commit 0b3d3ff15f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/ath/ath6kl/usb.c
View File

@ -1152,7 +1152,7 @@ static void ath6kl_usb_remove(struct usb_interface *interface)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int ath6kl_usb_suspend(struct usb_interface *interface, static int ath6kl_usb_pm_suspend(struct usb_interface *interface,
pm_message_t message) pm_message_t message)
{ {
struct ath6kl_usb *device; struct ath6kl_usb *device;
@ -1162,7 +1162,7 @@ static int ath6kl_usb_suspend(struct usb_interface *interface,
return 0; return 0;
} }
static int ath6kl_usb_resume(struct usb_interface *interface) static int ath6kl_usb_pm_resume(struct usb_interface *interface)
{ {
struct ath6kl_usb *device; struct ath6kl_usb *device;
device = usb_get_intfdata(interface); device = usb_get_intfdata(interface);
@ -1175,7 +1175,7 @@ static int ath6kl_usb_resume(struct usb_interface *interface)
return 0; return 0;
} }
static int ath6kl_usb_reset_resume(struct usb_interface *intf) static int ath6kl_usb_pm_reset_resume(struct usb_interface *intf)
{ {
if (usb_get_intfdata(intf)) if (usb_get_intfdata(intf))
ath6kl_usb_remove(intf); ath6kl_usb_remove(intf);
@ -1184,9 +1184,9 @@ static int ath6kl_usb_reset_resume(struct usb_interface *intf)
#else #else
#define ath6kl_usb_suspend NULL #define ath6kl_usb_pm_suspend NULL
#define ath6kl_usb_resume NULL #define ath6kl_usb_pm_resume NULL
#define ath6kl_usb_reset_resume NULL #define ath6kl_usb_pm_reset_resume NULL
#endif #endif
@ -1201,9 +1201,9 @@ MODULE_DEVICE_TABLE(usb, ath6kl_usb_ids);
static struct usb_driver ath6kl_usb_driver = { static struct usb_driver ath6kl_usb_driver = {
.name = "ath6kl_usb", .name = "ath6kl_usb",
.probe = ath6kl_usb_probe, .probe = ath6kl_usb_probe,
.suspend = ath6kl_usb_suspend, .suspend = ath6kl_usb_pm_suspend,
.resume = ath6kl_usb_resume, .resume = ath6kl_usb_pm_resume,
.reset_resume = ath6kl_usb_reset_resume, .reset_resume = ath6kl_usb_pm_reset_resume,
.disconnect = ath6kl_usb_remove, .disconnect = ath6kl_usb_remove,
.id_table = ath6kl_usb_ids, .id_table = ath6kl_usb_ids,
.supports_autosuspend = true, .supports_autosuspend = true,