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