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

Commit e6dd8cf2 authored by Mark Brown's avatar Mark Brown
Browse files

extcon: arizona: Retry failed HP measurements 



We now have mechanisms in place to allow retries so let's use them rather
than guessing.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 4e616877

drivers/extcon/extcon-arizona.c

+4 −6
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 
#include <linux/mfd/arizona/pdata.h>

#include <linux/mfd/arizona/registers.h>



#define ARIZONA_DEFAULT_HP 32



#define ARIZONA_NUM_BUTTONS 6



#define ARIZONA_ACCDET_MODE_MIC 0
@@ -208,7 +206,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info) 
		if (!(val & ARIZONA_HP_DONE)) {

			dev_err(arizona->dev, "HPDET did not complete: %x\n",

				val);

			val = ARIZONA_DEFAULT_HP;

			return -EAGAIN;

		}



		val &= ARIZONA_HP_LVL_MASK;
@@ -218,14 +216,14 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info) 
		if (!(val & ARIZONA_HP_DONE_B)) {

			dev_err(arizona->dev, "HPDET did not complete: %x\n",

				val);

			return ARIZONA_DEFAULT_HP;

			return -EAGAIN;

		}



		ret = regmap_read(arizona->regmap, ARIZONA_HP_DACVAL, &val);

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to read HP value: %d\n",

				ret);

			return ARIZONA_DEFAULT_HP;

			return -EAGAIN;

		}



		regmap_read(arizona->regmap, ARIZONA_HEADPHONE_DETECT_1,
@@ -267,7 +265,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info) 
		if (!(val & ARIZONA_HP_DONE_B)) {

			dev_err(arizona->dev, "HPDET did not complete: %x\n",

				val);

			return ARIZONA_DEFAULT_HP;

			return -EAGAIN;

		}



		val &= ARIZONA_HP_LVL_B_MASK;