[lkml]   [2013]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH 4/4] extcon: arizona: Eliminate dead error handling code
As a small disclaimer I would personally prefer to not merge this patch.
I have added it based on previous code review of the other patches in
this chain.

arizona_hpdet_do_id currently can only return 0 or -EAGAIN making the
else if clause handling error codes redundant, this patch removes this

Whilst this clause is not currently hit removing it makes the code
fragile. It will not be obvious whilst editing arizona_hpdet_do_id that
you shouldn't add a return value other than 0 or -EAGAIN.

Signed-off-by: Charles Keepax <>
drivers/extcon/extcon-arizona.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 0d70bf6..2313b1e 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -476,6 +476,9 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)
return val;

+/* This function should only return 0 or -EAGAIN, if other return values are
+ * added additional handling should be added in arizona_hpdet_irq.
+ */
static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading,
bool *mic)
@@ -591,8 +594,6 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data)
ret = arizona_hpdet_do_id(info, &reading, &mic);
if (ret == -EAGAIN)
goto out;
- else if (ret < 0)
- goto done;

/* Report high impedence cables as line outputs */
if (reading >= 5000)

 \ /
  Last update: 2013-11-08 15:01    [W:1.496 / U:0.296 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site