From 153a1225e290cf8aeceda9ed0573ca800f1f5df6 Mon Sep 17 00:00:00 2001 From: Devesh Jhunjhunwala Date: Tue, 14 Jun 2016 16:13:23 -0700 Subject: leds: qpnp-flash-v2: Separate switch node disable sequence Remove the leds_off label and move the switch node disable sequence into a separate function. Also take this opportunity to move the flash-led structs from header file to driver file. CRs-Fixed: 1024187 Change-Id: I5d4eb58f5ed3ace03190f3c48b98f0d88e8b8965 Signed-off-by: Devesh Jhunjhunwala --- include/linux/leds-qpnp-flash-v2.h | 40 -------------------------------------- 1 file changed, 40 deletions(-) (limited to 'include/linux') diff --git a/include/linux/leds-qpnp-flash-v2.h b/include/linux/leds-qpnp-flash-v2.h index 428c0671b716..47fd0699a9c1 100644 --- a/include/linux/leds-qpnp-flash-v2.h +++ b/include/linux/leds-qpnp-flash-v2.h @@ -19,46 +19,6 @@ #define ENABLE_REGULATOR BIT(0) #define QUERY_MAX_CURRENT BIT(1) -struct flash_regulator_data { - struct regulator *vreg; - const char *reg_name; - u32 max_volt_uv; -}; - -/* - * Configurations for each individual LED - */ -struct flash_node_data { - struct platform_device *pdev; - struct led_classdev cdev; - struct pinctrl *pinctrl; - struct pinctrl_state *gpio_state_active; - struct pinctrl_state *gpio_state_suspend; - struct pinctrl_state *hw_strobe_state_active; - struct pinctrl_state *hw_strobe_state_suspend; - int hw_strobe_gpio; - int ires_ua; - int max_current; - int current_ma; - u8 duration; - u8 id; - u8 type; - u8 ires; - u8 hdrm_val; - u8 current_reg_val; - u8 trigger; - bool led_on; -}; - -struct flash_switch_data { - struct platform_device *pdev; - struct led_classdev cdev; - struct flash_regulator_data *reg_data; - int led_mask; - int num_regulators; - bool regulator_on; -}; - int qpnp_flash_led_prepare(struct led_classdev *led_cdev, int options); #endif -- cgit v1.2.3