mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 19:30:30 +09:00
Merge remote-tracking branch 'lsk/v3.10/topic/pe-wq' into linux-linaro-lsk
This commit is contained in:
@@ -87,7 +87,8 @@ static irqreturn_t adc_jack_irq_thread(int irq, void *_data)
|
||||
{
|
||||
struct adc_jack_data *data = _data;
|
||||
|
||||
schedule_delayed_work(&data->handler, data->handling_delay);
|
||||
queue_delayed_work(system_power_efficient_wq,
|
||||
&data->handler, data->handling_delay);
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
|
||||
{
|
||||
struct gpio_extcon_data *extcon_data = dev_id;
|
||||
|
||||
schedule_delayed_work(&extcon_data->work,
|
||||
queue_delayed_work(system_power_efficient_wq, &extcon_data->work,
|
||||
extcon_data->debounce_jiffies);
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
@@ -1890,8 +1890,9 @@ int regulator_disable_deferred(struct regulator *regulator, int ms)
|
||||
rdev->deferred_disables++;
|
||||
mutex_unlock(&rdev->mutex);
|
||||
|
||||
ret = schedule_delayed_work(&rdev->disable_work,
|
||||
msecs_to_jiffies(ms));
|
||||
ret = queue_delayed_work(system_power_efficient_wq,
|
||||
&rdev->disable_work,
|
||||
msecs_to_jiffies(ms));
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
else
|
||||
|
||||
@@ -149,8 +149,9 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
|
||||
SND_SOC_DAPM_STREAM_STOP);
|
||||
} else {
|
||||
rtd->pop_wait = 1;
|
||||
schedule_delayed_work(&rtd->delayed_work,
|
||||
msecs_to_jiffies(rtd->pmdown_time));
|
||||
queue_delayed_work(system_power_efficient_wq,
|
||||
&rtd->delayed_work,
|
||||
msecs_to_jiffies(rtd->pmdown_time));
|
||||
}
|
||||
} else {
|
||||
/* capture streams can be powered down now */
|
||||
|
||||
@@ -263,7 +263,7 @@ static irqreturn_t gpio_handler(int irq, void *data)
|
||||
if (device_may_wakeup(dev))
|
||||
pm_wakeup_event(dev, gpio->debounce_time + 50);
|
||||
|
||||
schedule_delayed_work(&gpio->work,
|
||||
queue_delayed_work(system_power_efficient_wq, &gpio->work,
|
||||
msecs_to_jiffies(gpio->debounce_time));
|
||||
|
||||
return IRQ_HANDLED;
|
||||
|
||||
@@ -408,8 +408,9 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
|
||||
} else {
|
||||
/* start delayed pop wq here for playback streams */
|
||||
rtd->pop_wait = 1;
|
||||
schedule_delayed_work(&rtd->delayed_work,
|
||||
msecs_to_jiffies(rtd->pmdown_time));
|
||||
queue_delayed_work(system_power_efficient_wq,
|
||||
&rtd->delayed_work,
|
||||
msecs_to_jiffies(rtd->pmdown_time));
|
||||
}
|
||||
} else {
|
||||
/* capture streams can be powered down now */
|
||||
|
||||
Reference in New Issue
Block a user