Merge "mdss: display: remove checking of pwm gpio from pwm config" (84abce91) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_dsi_panel.c

+2 −21

Original line number	Diff line number	Diff line
		@@ -30,29 +30,10 @@ DEFINE_LED_TRIGGER(bl_led_trigger);

		void mdss_dsi_panel_pwm_cfg(struct mdss_dsi_ctrl_pdata *ctrl)
		{
		int ret;

		if (!gpio_is_valid(ctrl->pwm_pmic_gpio)) {
		pr_err("%s: pwm_pmic_gpio=%d Invalid\n", __func__,
		ctrl->pwm_pmic_gpio);
		ctrl->pwm_pmic_gpio = -1;
		return;
		}

		ret = gpio_request(ctrl->pwm_pmic_gpio, "disp_pwm");
		if (ret) {
		pr_err("%s: pwm_pmic_gpio=%d request failed\n", __func__,
		ctrl->pwm_pmic_gpio);
		ctrl->pwm_pmic_gpio = -1;
		return;
		}

		ctrl->pwm_bl = pwm_request(ctrl->pwm_lpg_chan, "lcd-bklt");
		if (ctrl->pwm_bl == NULL \|\| IS_ERR(ctrl->pwm_bl)) {
		pr_err("%s: lpg_chan=%d pwm request failed", __func__,
		ctrl->pwm_lpg_chan);
		gpio_free(ctrl->pwm_pmic_gpio);
		ctrl->pwm_pmic_gpio = -1;
		pr_err("%s: Error: lpg_chan=%d pwm request failed",
		__func__, ctrl->pwm_lpg_chan);
		}
		}