Commit 73b5ae34 authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel
Browse files

extcon: intel-cht-wc: Refactor cht_wc_extcon_get_charger() 



This is a preparation patch for adding support for registering
a power_supply class device.

Setting usbsrc to "CHT_WC_USBSRC_TYPE_SDP << CHT_WC_USBSRC_TYPE_SHIFT"
will make the following switch-case return EXTCON_CHG_USB_SDP
just as before, so there is no functional change.

Acked-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent b7fa2cd3

drivers/extcon/extcon-intel-cht-wc.c

+8 −7
Original line number Diff line number Diff line
@@ -153,14 +153,15 @@ static int cht_wc_extcon_get_charger(struct cht_wc_extcon_data *ext, 
	} while (time_before(jiffies, timeout));



	if (status != CHT_WC_USBSRC_STS_SUCCESS) {

		if (ignore_errors)

			return EXTCON_CHG_USB_SDP; /* Save fallback */



		if (!ignore_errors) {

			if (status == CHT_WC_USBSRC_STS_FAIL)

				dev_warn(ext->dev, "Could not detect charger type\n");

			else

				dev_warn(ext->dev, "Timeout detecting charger type\n");

		return EXTCON_CHG_USB_SDP; /* Save fallback */

		}



		/* Safe fallback */

		usbsrc = CHT_WC_USBSRC_TYPE_SDP << CHT_WC_USBSRC_TYPE_SHIFT;

	}



	usbsrc = (usbsrc & CHT_WC_USBSRC_TYPE_MASK) >> CHT_WC_USBSRC_TYPE_SHIFT;