From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Chanwoo Choi <cw00.choi@samsung.com>,
MyungJoo Ham <myungjoo.ham@samsung.com>
Cc: linux-kernel@vger.kernel.org,
patches@opensource.wolfsonmicro.com,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 02/11] extcon: arizona: Retry failed HP measurements
Date: Mon, 11 Feb 2013 16:26:57 +0000 [thread overview]
Message-ID: <1360600026-16878-2-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1360600026-16878-1-git-send-email-broonie@opensource.wolfsonmicro.com>
We now have mechanisms in place to allow retries so let's use them rather
than guessing.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/extcon/extcon-arizona.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index ce95f86..5283034 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -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;
--
1.7.10.4
next prev parent reply other threads:[~2013-02-11 16:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-11 16:26 [PATCH 00/11] extcon-arizona updates Mark Brown
2013-02-11 16:26 ` [PATCH 01/11] extcon: arizona: Disable debouce for accessory removal detection Mark Brown
2013-02-11 16:26 ` Mark Brown [this message]
2013-02-11 16:26 ` [PATCH 03/11] extcon: arizona: Remove duplicate rate configuration Mark Brown
2013-02-11 16:26 ` [PATCH 04/11] extcon: arizona: Support additional configuration of microphone detection Mark Brown
2013-02-11 16:27 ` [PATCH 05/11] extcon: arizona: Use regulated mode for microphone supply when detecting Mark Brown
2013-02-11 16:27 ` [PATCH 06/11] extcon: arizona: Remove extra jack flip increment Mark Brown
2013-02-11 16:27 ` [PATCH 07/11] extcon: arizona: Add some debounce time before starting HPDET identification Mark Brown
2013-02-11 16:27 ` [PATCH 08/11] extcon: arizona: Don't HPDET magic when headphones are enabled Mark Brown
2013-02-11 16:27 ` [PATCH 09/11] extcon: arizona: Clear _trig_sts bits after jack detection Mark Brown
2013-02-11 16:27 ` [PATCH 10/11] extcon: arizona: Always take the first HPDET reading as the final one Mark Brown
2013-02-11 16:27 ` [PATCH 11/11] extcon: arizona: Use MICDET for final microphone identification Mark Brown
2013-02-11 21:45 ` [PATCH 00/11] extcon-arizona updates Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360600026-16878-2-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=cw00.choi@samsung.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=patches@opensource.wolfsonmicro.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).