diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-06-01 08:20:32 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 11:00:59 +0100 |
| commit | 004eef269924da36be89b177085bc50fa8ddc8c4 (patch) | |
| tree | 29aa1c53eb58e8a082f2f6477fa51be98a76a61f | |
| parent | ad430828f1c83f9358e19361d8a1806c87806d19 (diff) | |
misc: shrm: Remove u8500 ED support
ST-Ericsson Linux next: Not tested, ask SSM for ER
ST-Ericsson ID: 342987
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I10725c885b3492014f5ee6006e188d569383960b
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24278
Reviewed-by: QATEST
Reviewed-by: Hemant-vilas RAMDASI <hemant.ramdasi@stericsson.com>
Reviewed-by: Kumar A SANGHVI <kumar.sanghvi@stericsson.com>
| -rw-r--r-- | drivers/misc/shrm/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/misc/shrm/shrm_protocol.c | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/drivers/misc/shrm/Kconfig b/drivers/misc/shrm/Kconfig index fffee1c703e..6bafdeec5b9 100644 --- a/drivers/misc/shrm/Kconfig +++ b/drivers/misc/shrm/Kconfig @@ -14,12 +14,6 @@ choice depends on U8500_SHRM default SHRM_V1_UPDATES_VERSION - config SHRM_ED_V1_VERSION - depends on U8500_SHRM - bool "SHRM ED / V1 " - help - Modem Images with ED/V1 updates - config SHRM_V1_UPDATES_VERSION depends on U8500_SHRM bool "SHRM V1 UPDATES" diff --git a/drivers/misc/shrm/shrm_protocol.c b/drivers/misc/shrm/shrm_protocol.c index 567c9b93d5f..315d4b7ff6e 100644 --- a/drivers/misc/shrm/shrm_protocol.c +++ b/drivers/misc/shrm/shrm_protocol.c @@ -37,7 +37,6 @@ static u8 recieve_audio_msg[8*1024]; static received_msg_handler rx_common_handler; static received_msg_handler rx_audio_handler; static struct hrtimer timer; -static char is_earlydrop; struct sock *shrm_nl_sk; static char shrm_common_tx_state = SHRM_SLEEP_STATE; @@ -698,11 +697,8 @@ int shrm_protocol_init(struct shrm_dev *shrm, rx_audio_handler = audio_rx_handler; atomic_set(&ac_sleep_disable_count, 0); - is_earlydrop = cpu_is_u8500ed(); - if (is_earlydrop != 0x01) { - hrtimer_init(&timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); - timer.function = callback; - } + hrtimer_init(&timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + timer.function = callback; shrm->shm_common_ch_wr_wq = create_singlethread_workqueue ("shm_common_channel_irq"); |