Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fe1e0e2 authored by Hans de Goede's avatar Hans de Goede Committed by Chanwoo Choi
Browse files

extcon: axp288: Simplify axp288_handle_chrg_det_event 



axp288_handle_chrg_det_event only gets called on change interrupts
(so not that often), extcon_set_state_sync() checks itself if there are
any actual changes before notifying listeners, and gpiod_set_value is
not really expensive either.

So we can simply always do both on each interrupt removing a bunch of
somewhat magic looking code from axp288_handle_chrg_det_event.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 1490d157

drivers/extcon/extcon-axp288.c

+12 −25
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ static void axp288_extcon_log_rsi(struct axp288_extcon_info *info) 


static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)

{

	static bool notify_otg, notify_charger;

	static unsigned int cable;

	int ret, stat, cfg, pwr_stat;

	u8 chrg_type;
@@ -168,7 +167,7 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info) 


	vbus_attach = (pwr_stat & PS_STAT_VBUS_PRESENT);

	if (!vbus_attach)

		goto notify_otg;

		goto no_vbus;



	/* Check charger detection completion status */

	ret = regmap_read(info->regmap, AXP288_BC_GLOBAL_REG, &cfg);
@@ -188,19 +187,14 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info) 
	switch (chrg_type) {

	case DET_STAT_SDP:

		dev_dbg(info->dev, "sdp cable is connected\n");

		notify_otg = true;

		notify_charger = true;

		cable = EXTCON_CHG_USB_SDP;

		break;

	case DET_STAT_CDP:

		dev_dbg(info->dev, "cdp cable is connected\n");

		notify_otg = true;

		notify_charger = true;

		cable = EXTCON_CHG_USB_CDP;

		break;

	case DET_STAT_DCP:

		dev_dbg(info->dev, "dcp cable is connected\n");

		notify_charger = true;

		cable = EXTCON_CHG_USB_DCP;

		break;

	default:
@@ -208,8 +202,7 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info) 
			"disconnect or unknown or ID event\n");

	}



notify_otg:

	if (notify_otg) {

no_vbus:

	/*

	 * If VBUS is absent Connect D+/D- lines to PMIC for BC

	 * detection. Else connect them to SOC for USB communication.
@@ -218,15 +211,9 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info) 
		gpiod_set_value(info->gpio_mux_cntl,

			vbus_attach ? EXTCON_GPIO_MUX_SEL_SOC

					: EXTCON_GPIO_MUX_SEL_PMIC);

	}



	if (notify_charger)

	extcon_set_state_sync(info->edev, cable, vbus_attach);



	/* Clear the flags on disconnect event */

	if (!vbus_attach)

		notify_otg = notify_charger = false;



	return 0;



dev_det_ret: