From ac536813fa240186f7268bcb400547a4b8f90164 Mon Sep 17 00:00:00 2001 From: Vinayak Pane Date: Wed, 2 May 2012 18:22:12 -0700 Subject: arm: tegra: xmm: baseband modem pm code cleanup - Platform data is treated as const and not modified in driver. - Driver specific data is stored and used from a new structure. - Remove support for older firmware version of XMM modem (<1130). - Shortening of names for compliance and to fit in 80 characters. - Organize irq function to reduce indentation. Change-Id: I269401aa0a2efc685d7a630b4952cb31cbca6a4f Signed-off-by: Vinayak Pane Reviewed-on: http://git-master/r/101587 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Steve Lin --- arch/arm/mach-tegra/baseband-xmm-power.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'arch/arm/mach-tegra/baseband-xmm-power.h') diff --git a/arch/arm/mach-tegra/baseband-xmm-power.h b/arch/arm/mach-tegra/baseband-xmm-power.h index 0768ed191b05..1f08e3b6900c 100644 --- a/arch/arm/mach-tegra/baseband-xmm-power.h +++ b/arch/arm/mach-tegra/baseband-xmm-power.h @@ -71,24 +71,19 @@ enum baseband_xmm_power_work_state_t { BBXMM_WORK_INIT_FLASH_STEP1, /* initialize flash (with power management support) modem */ BBXMM_WORK_INIT_FLASH_PM_STEP1, - BBXMM_WORK_INIT_FLASH_PM_VER_LT_1130_STEP1, - BBXMM_WORK_INIT_FLASH_PM_VER_GE_1130_STEP1, /* initialize flashless (with power management support) modem */ BBXMM_WORK_INIT_FLASHLESS_PM_STEP1, - BBXMM_WORK_INIT_FLASHLESS_PM_VER_LT_1130_WAIT_IRQ, - BBXMM_WORK_INIT_FLASHLESS_PM_VER_LT_1130_STEP1, - BBXMM_WORK_INIT_FLASHLESS_PM_VER_LT_1130_STEP2, - BBXMM_WORK_INIT_FLASHLESS_PM_VER_GE_1130_STEP1, - BBXMM_WORK_INIT_FLASHLESS_PM_VER_GE_1130_STEP2, - BBXMM_WORK_INIT_FLASHLESS_PM_VER_GE_1130_STEP3, - BBXMM_WORK_INIT_FLASHLESS_PM_VER_GE_1130_STEP4, + BBXMM_WORK_INIT_FLASHLESS_PM_STEP2, + BBXMM_WORK_INIT_FLASHLESS_PM_STEP3, + BBXMM_WORK_INIT_FLASHLESS_PM_STEP4, }; -struct baseband_xmm_power_work_t { - /* work structure must be first structure member */ - struct work_struct work; +struct xmm_power_data { /* xmm modem state */ enum baseband_xmm_power_work_state_t state; + struct baseband_power_platform_data *pdata; + struct work_struct work; + struct platform_device *hsic_device; }; enum baseband_xmm_powerstate_t { @@ -104,8 +99,9 @@ enum baseband_xmm_powerstate_t { BBXMM_PS_LAST = -1, }; -irqreturn_t baseband_xmm_power_ipc_ap_wake_irq(int irq, void *dev_id); +irqreturn_t xmm_power_ipc_ap_wake_irq(int irq, void *dev_id); void baseband_xmm_set_power_status(unsigned int status); +extern struct xmm_power_data xmm_power_drv_data; #endif /* BASREBAND_XMM_POWER_H */ -- cgit v1.2.3