summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2011-03-30 00:56:26 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-05 05:58:16 (GMT)
commit2df44b8b9bd9c3d9dcc8d4532d02515dd8712b6e (patch)
tree9a369992cb4cc3c0f44bbff938eb5c69854e94c8
parent60a9bc57804bd6a629ff1016fea43766f3f6eaf3 (diff)
downloadlinux-fsl-qoriq-2df44b8b9bd9c3d9dcc8d4532d02515dd8712b6e.tar.xz
ath6kl: remove completely pointles platform driver
Perhaps there was some good intention on having some platform driver on ath6kl, but right now its pointless. Kill! Cc: Naveen Singh <nsingh@atheros.com> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_drv.c6
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_pm.c55
-rw-r--r--drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h3
3 files changed, 0 insertions, 64 deletions
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 056acae..e3c1f58 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/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/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c
index eeb3807..1e0ace8 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_pm.c
+++ b/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/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h b/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
index a8e8e36..184dbdb 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h
+++ b/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);