linux/drivers/leds
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
..
dell-led.c drivers/leds: Add module.h to files using it implicitly 2011-10-31 19:31:49 -04:00
Kconfig Merge branch 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds into next/drivers 2012-08-13 16:45:48 +02:00
led-class.c leds: Rename led_brightness_set() to led_set_brightness() 2012-07-24 07:52:34 +08:00
led-core.c leds: fix sparse warnings due to missing static 2012-07-24 07:52:35 +08:00
led-triggers.c Revert "leds: use led_set_brightness in led_trigger_event" 2012-08-13 14:33:02 +08:00
leds-88pm860x.c leds-88pm860x: use devm_kzalloc function 2012-07-24 07:52:35 +08:00
leds-adp5520.c leds: convert ADP5520 LED driver to devm_kzalloc() and cleanup error exit path 2012-07-24 07:52:39 +08:00
leds-asic3.c leds: convert HTC ASIC3 LED driver to devm_kzalloc() and cleanup error exit path 2012-07-24 07:52:37 +08:00
leds-atmel-pwm.c leds: convert Atmel PWM LED driver to devm_kzalloc() 2012-07-24 07:52:37 +08:00
leds-bd2802.c leds: convert BD2802 RGB LED driver to devm_kzalloc() and cleanup error exit path 2012-07-24 07:52:38 +08:00
leds-blinkm.c LEDS: propagate error codes in blinkm_detect() 2012-07-27 08:15:09 +08:00
leds-clevo-mail.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
leds-cobalt-qube.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-cobalt-raq.c drivers/leds: Add export.h for THIS_MODULE to leds-cobalt-raq.c 2011-10-31 19:31:50 -04:00
leds-da903x.c leds: convert DA9030/DA9034 LED driver to devm_kzalloc() and cleanup error exit path 2012-07-24 07:52:37 +08:00
leds-da9052.c leds: driver for DA9052/53 PMIC v2 2012-05-29 16:22:31 -07:00
leds-dac124s085.c leds: convert DAC124S085 LED driver to devm_kzalloc() 2012-07-24 07:52:40 +08:00
leds-fsg.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-gpio-register.c leds: provide helper to register "leds-gpio" devices 2011-05-25 08:39:51 -07:00
leds-gpio.c leds: Use devm_kzalloc in leds-gpio.c file 2012-07-24 07:52:36 +08:00
leds-hp6xx.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-lm3530.c leds: convert LM3530 LED driver to devm_kzalloc() and cleanup error exit path 2012-07-24 07:52:40 +08:00
leds-lm3533.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
leds-lm3556.c leds: Add LED driver for lm3556 chip 2012-07-24 07:52:35 +08:00
leds-locomo.c drivers/leds: Add module.h to files using it implicitly 2011-10-31 19:31:49 -04:00
leds-lp3944.c leds: convert LP3944 LED driver to devm_kzalloc() 2012-07-24 07:52:37 +08:00
leds-lp5521.c leds: convert LP5521 LED driver to devm_kzalloc() and cleanup error exit path 2012-07-24 07:52:37 +08:00
leds-lp5523.c leds: convert LP5523 LED driver to devm_kzalloc() and cleanup error exit path 2012-07-24 07:52:38 +08:00
leds-lp8788.c Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
leds-lt3593.c leds: convert LT3593 LED driver to devm_kzalloc() 2012-07-24 07:52:38 +08:00
leds-max8997.c leds: max8997: Simplify max8997_led_set_mode implementation 2012-07-24 15:48:47 +08:00
leds-mc13783.c leds: convert Freescale MC13783 LED driver to devm_kzalloc() and cleanup error exit path 2012-07-24 07:52:39 +08:00
leds-net48xx.c drivers/leds: Add module.h to files using it implicitly 2011-10-31 19:31:49 -04:00
leds-netxbig.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
leds-ns2.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
leds-ot200.c leds: add led driver for Bachmann's ot200 2012-01-23 08:38:47 -08:00
leds-pca955x.c leds: convert PCA955x LED driver to devm_kzalloc() and cleanup error exit path 2012-07-24 07:52:39 +08:00
leds-pca9532.c leds: convert PCA9532 LED driver to devm_kzalloc() 2012-07-24 07:52:39 +08:00
leds-pca9633.c leds: convert PCA9633 LED driver to devm_kzalloc() 2012-07-24 07:52:38 +08:00
leds-pwm.c leds: Use devm_kzalloc in leds-pwm.c file 2012-07-24 07:52:36 +08:00
leds-rb532.c leds: convert led platform drivers to module_platform_driver 2012-01-10 16:30:48 -08:00
leds-regulator.c leds: Use devm_kzalloc in leds-regulator.c file 2012-07-24 07:52:36 +08:00
leds-renesas-tpu.c leds: renesas: fix error handling 2012-08-13 14:34:02 +08:00
leds-s3c24xx.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
leds-ss4200.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
leds-sunfire.c leds: convert Sun Fire LED driver to devm_kzalloc() and cleanup error exit path 2012-07-24 07:52:39 +08:00
leds-tca6507.c leds: convert TCA6507 LED driver to devm_kzalloc() 2012-07-24 07:52:39 +08:00
leds-wm831x-status.c leds: convert wm831x status driver to devm_kzalloc() 2012-01-10 16:30:49 -08:00
leds-wm8350.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
leds-wrap.c drivers/leds: Add module.h to files using it implicitly 2011-10-31 19:31:49 -04:00
leds.h leds: Rename led_set_brightness() to __led_set_brightness() 2012-07-24 07:52:34 +08:00
ledtrig-backlight.c leds: Rename led_set_brightness() to __led_set_brightness() 2012-07-24 07:52:34 +08:00
ledtrig-cpu.c led-triggers: create a trigger for CPU activity 2012-07-31 21:23:31 +08:00
ledtrig-default-on.c leds: Rename led_set_brightness() to __led_set_brightness() 2012-07-24 07:52:34 +08:00
ledtrig-gpio.c leds: Rename led_set_brightness() to __led_set_brightness() 2012-07-24 07:52:34 +08:00
ledtrig-heartbeat.c leds: Rename led_set_brightness() to __led_set_brightness() 2012-07-24 07:52:34 +08:00
ledtrig-ide-disk.c ledtrig-ide-disk: use generic one-shot blink api 2012-07-24 07:52:34 +08:00
ledtrig-oneshot.c leds: Rename led_brightness_set() to led_set_brightness() 2012-07-24 07:52:34 +08:00
ledtrig-timer.c leds: Rename led_brightness_set() to led_set_brightness() 2012-07-24 07:52:34 +08:00
ledtrig-transient.c leds: Rename led_set_brightness() to __led_set_brightness() 2012-07-24 07:52:34 +08:00
Makefile Merge branch 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds into next/drivers 2012-08-13 16:45:48 +02:00