Skip to content

enrc2b: remove the HS irq derp #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
htcdrelek13 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

enrc2b: remove the HS irq derp #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions arch/arm/mach-tegra/htc_headset_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ unsigned long unstable_jiffies = 0.02 * HZ;
unsigned long irq_delay = 0.010 * HZ;

static int headset_uart_enable = 0;
static bool key_irq_enabled = false;

/*
* This function should be called while caller thread holding a
Expand Down Expand Up @@ -134,12 +133,8 @@ static void button_gpio_work_func(struct work_struct *work)

static void hs_key_irq_enable_func(struct work_struct *work)
{
if (key_irq_enabled)
return;

HS_DBG();
enable_irq(hi->key_irq);
key_irq_enabled = true;
}

static void cancel_button_work_func(struct work_struct *work)
Expand Down Expand Up @@ -173,7 +168,6 @@ static irqreturn_t button_irq_handler(int irq, void *dev_id)
HS_DBG();

disable_irq_nosync(hi->key_irq);
key_irq_enabled = false;

hi->key_irq_type ^= irq_mask;
irq_set_irq_type(hi->key_irq, hi->key_irq_type);
Expand Down Expand Up @@ -342,7 +336,6 @@ static void detect_gpio_work_func(struct work_struct *work)
if (ret < 0)
HS_ERR("request irq error;");
disable_irq_nosync(hi->key_irq);
key_irq_enabled = false;
}

if (hi->key_irq){
Expand All @@ -351,13 +344,11 @@ static void detect_gpio_work_func(struct work_struct *work)
if (ret < 0)
HS_ERR("set irq wake error");
enable_irq(hi->key_irq);
key_irq_enabled = true;
}else{
ret = irq_set_irq_wake(hi->key_irq, 0);
if (ret < 0)
HS_ERR("set irq wake error");
disable_irq_nosync(hi->key_irq);
key_irq_enabled = false;
}
}
}
Expand All @@ -366,15 +357,11 @@ static void detect_gpio_work_func(struct work_struct *work)
static int hs_gpio_key_int_enable(int enable)
{
if (enable) {
if (!key_irq_enabled){
HS_LOG("Key int enable");
enable_irq(hi->key_irq);
key_irq_enabled = true;
}
HS_LOG("Key int enable");
enable_irq(hi->key_irq);
} else {
HS_LOG("Key int disable");
disable_irq_nosync(hi->key_irq);
key_irq_enabled = false;
}
return 0;
}
Expand Down