aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/extcon/extcon-arizona.c
diff options
context:
space:
mode:
authorChanwoo Choi <cw00.choi@samsung.com>2013-08-22 21:21:37 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 15:03:30 -0400
commitc2275d2fa587712d285a4db97a68322a233ad2c8 (patch)
tree572602db3866ccd4ad67efd32c41f600ee75bf55 /drivers/extcon/extcon-arizona.c
parent30399bbfa698689e81f9507992034fe09700941b (diff)
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>
Diffstat (limited to 'drivers/extcon/extcon-arizona.c')
-rw-r--r--drivers/extcon/extcon-arizona.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index e55713083c78..9431092f52fc 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -738,8 +738,8 @@ err:
738static void arizona_micd_timeout_work(struct work_struct *work) 738static void arizona_micd_timeout_work(struct work_struct *work)
739{ 739{
740 struct arizona_extcon_info *info = container_of(work, 740 struct arizona_extcon_info *info = container_of(work,
741 struct arizona_extcon_info, 741 struct arizona_extcon_info,
742 micd_timeout_work.work); 742 micd_timeout_work.work);
743 743
744 mutex_lock(&info->lock); 744 mutex_lock(&info->lock);
745 745
@@ -756,8 +756,8 @@ static void arizona_micd_timeout_work(struct work_struct *work)
756static void arizona_micd_detect(struct work_struct *work) 756static void arizona_micd_detect(struct work_struct *work)
757{ 757{
758 struct arizona_extcon_info *info = container_of(work, 758 struct arizona_extcon_info *info = container_of(work,
759 struct arizona_extcon_info, 759 struct arizona_extcon_info,
760 micd_detect_work.work); 760 micd_detect_work.work);
761 struct arizona *arizona = info->arizona; 761 struct arizona *arizona = info->arizona;
762 unsigned int val = 0, lvl; 762 unsigned int val = 0, lvl;
763 int ret, i, key; 763 int ret, i, key;
@@ -769,7 +769,8 @@ static void arizona_micd_detect(struct work_struct *work)
769 for (i = 0; i < 10 && !(val & 0x7fc); i++) { 769 for (i = 0; i < 10 && !(val & 0x7fc); i++) {
770 ret = regmap_read(arizona->regmap, ARIZONA_MIC_DETECT_3, &val); 770 ret = regmap_read(arizona->regmap, ARIZONA_MIC_DETECT_3, &val);
771 if (ret != 0) { 771 if (ret != 0) {
772 dev_err(arizona->dev, "Failed to read MICDET: %d\n", ret); 772 dev_err(arizona->dev,
773 "Failed to read MICDET: %d\n", ret);
773 mutex_unlock(&info->lock); 774 mutex_unlock(&info->lock);
774 return; 775 return;
775 } 776 }
@@ -777,7 +778,8 @@ static void arizona_micd_detect(struct work_struct *work)
777 dev_dbg(arizona->dev, "MICDET: %x\n", val); 778 dev_dbg(arizona->dev, "MICDET: %x\n", val);
778 779
779 if (!(val & ARIZONA_MICD_VALID)) { 780 if (!(val & ARIZONA_MICD_VALID)) {
780 dev_warn(arizona->dev, "Microphone detection state invalid\n"); 781 dev_warn(arizona->dev,
782 "Microphone detection state invalid\n");
781 mutex_unlock(&info->lock); 783 mutex_unlock(&info->lock);
782 return; 784 return;
783 } 785 }
@@ -925,8 +927,8 @@ static irqreturn_t arizona_micdet(int irq, void *data)
925static void arizona_hpdet_work(struct work_struct *work) 927static void arizona_hpdet_work(struct work_struct *work)
926{ 928{
927 struct arizona_extcon_info *info = container_of(work, 929 struct arizona_extcon_info *info = container_of(work,
928 struct arizona_extcon_info, 930 struct arizona_extcon_info,
929 hpdet_work.work); 931 hpdet_work.work);
930 932
931 mutex_lock(&info->lock); 933 mutex_lock(&info->lock);
932 arizona_start_hpdet_acc_id(info); 934 arizona_start_hpdet_acc_id(info);
@@ -973,10 +975,13 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
973 &info->hpdet_work, 975 &info->hpdet_work,
974 msecs_to_jiffies(HPDET_DEBOUNCE)); 976 msecs_to_jiffies(HPDET_DEBOUNCE));
975 977
976 if (cancelled_mic) 978 if (cancelled_mic) {
979 int micd_timeout = info->micd_timeout;
980
977 queue_delayed_work(system_power_efficient_wq, 981 queue_delayed_work(system_power_efficient_wq,
978 &info->micd_timeout_work, 982 &info->micd_timeout_work,
979 msecs_to_jiffies(info->micd_timeout)); 983 msecs_to_jiffies(micd_timeout));
984 }
980 985
981 goto out; 986 goto out;
982 } 987 }