diff options
| author | Rakesh Goyal <rgoyal@nvidia.com> | 2012-03-10 07:03:17 +0530 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-03-15 08:45:18 -0700 |
| commit | 3d77a4f0c1763ecbe41b63e238a9fb82b262bcf5 (patch) | |
| tree | e5efd0f6caf2e0c66e2cce7457638ed7a27c4d9e /include/linux | |
| parent | c8c6328fac300f8b93cb61c99e8280981692fa56 (diff) | |
misc: bluetooth: clean ti_bluesleep patch
Remove dead code
Remove whitespace
Remove platform callback function and add wake_lock/wake_unlock
Fix compilation warnings
Bug 933054
Bug 931931
Change-Id: I5b0947ad2053f9e0437ffe89879df2c84786ec9c
Signed-off-by: Rakesh Goyal <rgoyal@nvidia.com>
Reviewed-on: http://git-master/r/89274
Reviewed-by: Nagarjuna Kristam <nkristam@nvidia.com>
Tested-by: Nagarjuna Kristam <nkristam@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ti_wilink_st.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/linux/ti_wilink_st.h b/include/linux/ti_wilink_st.h index 4ebb5adf494d..1c68538840f5 100644 --- a/include/linux/ti_wilink_st.h +++ b/include/linux/ti_wilink_st.h @@ -24,7 +24,9 @@ #ifndef TI_WILINK_ST_H #define TI_WILINK_ST_H +#include <linux/wakelock.h> +#include <linux/serial_core.h> /** * enum proto-type - The protocol on WiLink chips which share a * common physical interface like UART. @@ -156,6 +158,7 @@ struct st_data_s { unsigned long ll_state; void *kim_data; struct tty_struct *tty; + struct wake_lock st_wk_lock; }; /* @@ -396,7 +399,7 @@ static inline unsigned long st_ll_getstate(struct st_data_s *ll){ return 0; } #endif unsigned long st_ll_sleep_state(struct st_data_s *, unsigned char); void st_ll_wakeup(struct st_data_s *); -int bluesleep_start(struct uart_port *uport); +int bluesleep_start(struct uart_port *); void bluesleep_stop(void); @@ -449,14 +452,6 @@ struct ti_st_plat_data { unsigned long baud_rate; int (*suspend)(struct platform_device *, pm_message_t); int (*resume)(struct platform_device *); -/* int (*chip_enable) (struct kim_data_s *); - int (*chip_disable) (struct kim_data_s *); - int (*chip_asleep) (struct kim_data_s *); - int (*chip_awake) (struct kim_data_s *);*/ - int (*chip_enable) (void); - int (*chip_disable) (void); - int (*chip_asleep) (void); - int (*chip_awake) (void); }; #endif /* TI_WILINK_ST_H */ |