---

yaml --- r: 249014 b: refs/heads/master c: 2df44b8 h: refs/heads/master v: v3
git-mirror · Apr 5, 2011 · 8f446d1 · 8f446d1
1 parent aba5b19
commit 8f446d1
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 65 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60a9bc57804bd6a629ff1016fea43766f3f6eaf3
+refs/heads/master: 2df44b8b9bd9c3d9dcc8d4532d02515dd8712b6e
diff --git a/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -636,10 +636,6 @@ ar6000_init_module(void)
     osdrvCallbacks.devicePowerChangeHandler = ar6000_power_change_ev;
 #endif
 
-    r = ar6000_pm_init();
-    if (r)
-	return r;
-
 #ifdef DEBUG
     /* Set the debug flags if specified at load time */
     if(debugflags != 0)
@@ -689,8 +685,6 @@ ar6000_cleanup_module(void)
 
     a_module_debug_support_cleanup();
 
-    ar6000_pm_exit();
-
     AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("ar6000_cleanup: success\n"));
 }
 

diff --git a/trunk/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/trunk/drivers/staging/ath6kl/os/linux/ar6000_pm.c
@@ -302,35 +302,6 @@ int ar6000_power_change_ev(void *context, u32 config)
     return status;
 }
 
-static int ar6000_pm_probe(struct platform_device *pdev)
-{
-    return 0;
-}
-
-static int ar6000_pm_remove(struct platform_device *pdev)
-{
-    return 0;
-}
-
-static int ar6000_pm_suspend(struct platform_device *pdev, pm_message_t state)
-{
-    return 0;
-}
-
-static int ar6000_pm_resume(struct platform_device *pdev)
-{
-    return 0;
-}
-
-static struct platform_driver ar6000_pm_device = {
-    .probe      = ar6000_pm_probe,
-    .remove     = ar6000_pm_remove,
-    .suspend    = ar6000_pm_suspend,
-    .resume     = ar6000_pm_resume,
-    .driver     = {
-        .name = "wlan_ar6000_pm",
-    },
-};
 #endif /* CONFIG_PM */
 
 int
@@ -653,29 +624,3 @@ ar6000_set_wlan_state(struct ar6_softc *ar, AR6000_WLAN_STATE state)
     status = ar6000_update_wlan_pwr_state(ar, state, false);
     return status;
 }
-
-int ar6000_pm_init()
-{
-	int  r;
-	A_REGISTER_MODULE_DEBUG_INFO(pm);
-
-#ifdef CONFIG_PM
-	/*
-	 * Register ar6000_pm_device into system.
-	 * We should also add platform_device into the first item of array
-	 * of devices[] in file arch/xxx/mach-xxx/board-xxxx.c
-	 */
-	r = platform_driver_register(&ar6000_pm_device);
-	if (r < 0)
-		return -ENODEV;
-#endif /* CONFIG_PM */
-
-	return 0;
-}
-
-void ar6000_pm_exit()
-{
-#ifdef CONFIG_PM
-	platform_driver_unregister(&ar6000_pm_device);
-#endif /* CONFIG_PM */
-}
diff --git a/trunk/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h b/trunk/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
@@ -178,9 +178,6 @@ int ar6000_power_change_ev(void *context, u32 config);
 void ar6000_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent);
 #endif
 
-int ar6000_pm_init(void);
-void ar6000_pm_exit(void);
-
 #ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT
 int ar6000_add_ap_interface(struct ar6_softc *ar, char *ifname);
 int ar6000_remove_ap_interface(struct ar6_softc *ar);