linux/sound/pci
Linus Torvalds 033d9959ed Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue changes from Tejun Heo:
 "This is workqueue updates for v3.7-rc1.  A lot of activities this
  round including considerable API and behavior cleanups.

   * delayed_work combines a timer and a work item.  The handling of the
     timer part has always been a bit clunky leading to confusing
     cancelation API with weird corner-case behaviors.  delayed_work is
     updated to use new IRQ safe timer and cancelation now works as
     expected.

   * Another deficiency of delayed_work was lack of the counterpart of
     mod_timer() which led to cancel+queue combinations or open-coded
     timer+work usages.  mod_delayed_work[_on]() are added.

     These two delayed_work changes make delayed_work provide interface
     and behave like timer which is executed with process context.

   * A work item could be executed concurrently on multiple CPUs, which
     is rather unintuitive and made flush_work() behavior confusing and
     half-broken under certain circumstances.  This problem doesn't
     exist for non-reentrant workqueues.  While non-reentrancy check
     isn't free, the overhead is incurred only when a work item bounces
     across different CPUs and even in simulated pathological scenario
     the overhead isn't too high.

     All workqueues are made non-reentrant.  This removes the
     distinction between flush_[delayed_]work() and
     flush_[delayed_]_work_sync().  The former is now as strong as the
     latter and the specified work item is guaranteed to have finished
     execution of any previous queueing on return.

   * In addition to the various bug fixes, Lai redid and simplified CPU
     hotplug handling significantly.

   * Joonsoo introduced system_highpri_wq and used it during CPU
     hotplug.

  There are two merge commits - one to pull in IRQ safe timer from
  tip/timers/core and the other to pull in CPU hotplug fixes from
  wq/for-3.6-fixes as Lai's hotplug restructuring depended on them."

Fixed a number of trivial conflicts, but the more interesting conflicts
were silent ones where the deprecated interfaces had been used by new
code in the merge window, and thus didn't cause any real data conflicts.

Tejun pointed out a few of them, I fixed a couple more.

* 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (46 commits)
  workqueue: remove spurious WARN_ON_ONCE(in_irq()) from try_to_grab_pending()
  workqueue: use cwq_set_max_active() helper for workqueue_set_max_active()
  workqueue: introduce cwq_set_max_active() helper for thaw_workqueues()
  workqueue: remove @delayed from cwq_dec_nr_in_flight()
  workqueue: fix possible stall on try_to_grab_pending() of a delayed work item
  workqueue: use hotcpu_notifier() for workqueue_cpu_down_callback()
  workqueue: use __cpuinit instead of __devinit for cpu callbacks
  workqueue: rename manager_mutex to assoc_mutex
  workqueue: WORKER_REBIND is no longer necessary for idle rebinding
  workqueue: WORKER_REBIND is no longer necessary for busy rebinding
  workqueue: reimplement idle worker rebinding
  workqueue: deprecate __cancel_delayed_work()
  workqueue: reimplement cancel_delayed_work() using try_to_grab_pending()
  workqueue: use mod_delayed_work() instead of __cancel + queue
  workqueue: use irqsafe timer for delayed_work
  workqueue: clean up delayed_work initializers and add missing one
  workqueue: make deferrable delayed_work initializer names consistent
  workqueue: cosmetic whitespace updates for macro definitions
  workqueue: deprecate system_nrt[_freezable]_wq
  workqueue: deprecate flush[_delayed]_work_sync()
  ...
2012-10-02 09:54:49 -07:00
..
ac97 ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
ali5451 ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
asihpi ALSA: asihpi - Revert module_pci_driver conversion for asihpi.c 2012-04-26 07:19:39 +02:00
au88x0 ALSA: au88x0 - Remove unused "Master Mono" Playback Volume and Playback Switch of ac97 codec 2012-06-05 18:02:27 +02:00
aw2 ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
ca0106 ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
cs46xx ALSA: cs46xx - signedness bug in snd_cs46xx_codec_read() 2012-08-10 12:11:21 +02:00
cs5535audio ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
ctxfi ALSA: sound/pci/ctxfi/ctatc.c: fix error return code 2012-08-20 10:57:30 +02:00
echoaudio ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
emu10k1 ALSA: emu10k1: Avoid access to invalid pages when period=1 2012-08-03 12:51:21 +02:00
hda ALSA: hda - Yet another position_fix quirk for ASUS machines 2012-09-13 16:56:13 +02:00
ice1712 ALSA: ice1724: Use linear scale for AK4396 volume control. 2012-09-12 16:17:41 +02:00
korg1212 ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
lola ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
lx6464es ALSA: lx6464es: Add a missing error check 2012-08-14 17:42:11 +02:00
mixart ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
nm256 ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
oxygen workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
pcxhr ALSA: pcxhr: Add LTC support 2012-06-20 08:35:37 +02:00
riptide ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
rme9652 ALSA: sound/pci/rme9652/hdspm.c: fix error return code 2012-08-20 11:00:51 +02:00
trident ALSA: Move some headers to local directories from include/sound 2012-07-03 08:23:09 +02:00
vx222 ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
ymfpci ALSA: Move some headers to local directories from include/sound 2012-07-03 08:23:09 +02:00
ad1889.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
ad1889.h
ak4531_codec.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
als300.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
als4000.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
atiixp_modem.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
atiixp.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
azt3328.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
azt3328.h
bt87x.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
cmipci.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
cs4281.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
cs5530.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
ens1370.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
ens1371.c
es1938.c Merge branch 'topic/pm-convert' into for-next 2012-07-19 08:21:57 +02:00
es1968.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
fm801.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
intel8x0.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
intel8x0m.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
Kconfig Merge branch 'topic/misc' into for-linus 2012-05-21 12:51:35 +02:00
maestro3.c Merge branch 'topic/pm-convert' into for-next 2012-07-19 08:21:57 +02:00
Makefile ALSA: Add the driver for Digigram Lola PCI-e boards 2011-05-03 16:31:05 +02:00
rme32.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
rme96.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
sis7019.c ALSA: sound/pci/sis7019.c: fix error return code 2012-08-20 10:57:51 +02:00
sis7019.h
sonicvibes.c ALSA: pci: clean up using module_pci_driver() 2012-04-24 12:25:00 +02:00
via82xx_modem.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00
via82xx.c ALSA: Convert to new pm_ops for PCI drivers 2012-07-03 08:23:03 +02:00