extcon: Fix up 80 column coding style issues
This patch fix 80 column coding sytle issues by using checkpatch script. Cc: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Cc: Mark Brown <broonie@kernel.org> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
30399bbfa6
commit
c2275d2fa5
@@ -738,8 +738,8 @@ err:
|
||||
static void arizona_micd_timeout_work(struct work_struct *work)
|
||||
{
|
||||
struct arizona_extcon_info *info = container_of(work,
|
||||
struct arizona_extcon_info,
|
||||
micd_timeout_work.work);
|
||||
struct arizona_extcon_info,
|
||||
micd_timeout_work.work);
|
||||
|
||||
mutex_lock(&info->lock);
|
||||
|
||||
@@ -756,8 +756,8 @@ static void arizona_micd_timeout_work(struct work_struct *work)
|
||||
static void arizona_micd_detect(struct work_struct *work)
|
||||
{
|
||||
struct arizona_extcon_info *info = container_of(work,
|
||||
struct arizona_extcon_info,
|
||||
micd_detect_work.work);
|
||||
struct arizona_extcon_info,
|
||||
micd_detect_work.work);
|
||||
struct arizona *arizona = info->arizona;
|
||||
unsigned int val = 0, lvl;
|
||||
int ret, i, key;
|
||||
@@ -769,7 +769,8 @@ static void arizona_micd_detect(struct work_struct *work)
|
||||
for (i = 0; i < 10 && !(val & 0x7fc); i++) {
|
||||
ret = regmap_read(arizona->regmap, ARIZONA_MIC_DETECT_3, &val);
|
||||
if (ret != 0) {
|
||||
dev_err(arizona->dev, "Failed to read MICDET: %d\n", ret);
|
||||
dev_err(arizona->dev,
|
||||
"Failed to read MICDET: %d\n", ret);
|
||||
mutex_unlock(&info->lock);
|
||||
return;
|
||||
}
|
||||
@@ -777,7 +778,8 @@ static void arizona_micd_detect(struct work_struct *work)
|
||||
dev_dbg(arizona->dev, "MICDET: %x\n", val);
|
||||
|
||||
if (!(val & ARIZONA_MICD_VALID)) {
|
||||
dev_warn(arizona->dev, "Microphone detection state invalid\n");
|
||||
dev_warn(arizona->dev,
|
||||
"Microphone detection state invalid\n");
|
||||
mutex_unlock(&info->lock);
|
||||
return;
|
||||
}
|
||||
@@ -925,8 +927,8 @@ static irqreturn_t arizona_micdet(int irq, void *data)
|
||||
static void arizona_hpdet_work(struct work_struct *work)
|
||||
{
|
||||
struct arizona_extcon_info *info = container_of(work,
|
||||
struct arizona_extcon_info,
|
||||
hpdet_work.work);
|
||||
struct arizona_extcon_info,
|
||||
hpdet_work.work);
|
||||
|
||||
mutex_lock(&info->lock);
|
||||
arizona_start_hpdet_acc_id(info);
|
||||
@@ -973,10 +975,13 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
|
||||
&info->hpdet_work,
|
||||
msecs_to_jiffies(HPDET_DEBOUNCE));
|
||||
|
||||
if (cancelled_mic)
|
||||
if (cancelled_mic) {
|
||||
int micd_timeout = info->micd_timeout;
|
||||
|
||||
queue_delayed_work(system_power_efficient_wq,
|
||||
&info->micd_timeout_work,
|
||||
msecs_to_jiffies(info->micd_timeout));
|
||||
msecs_to_jiffies(micd_timeout));
|
||||
}
|
||||
|
||||
goto out;
|
||||
}
|
||||
|
Reference in New Issue
Block a user