From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Sep 2012 04:36:19 +0000 (+1000)
Subject: Merge remote-tracking branch 'workqueues/for-next'
X-Git-Tag: next-20120907~24
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ae6b0b560c47bea40614e243d4ec429e948f2b28;p=karo-tx-linux.git

Merge remote-tracking branch 'workqueues/for-next'

Conflicts:
	drivers/hid/hid-picolcd.c
---

ae6b0b560c47bea40614e243d4ec429e948f2b28
diff --cc drivers/char/tpm/tpm.c
index 6724615a4fdd,3af9f4d1a23f..f26afdb1a702
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@@ -1168,10 -1172,10 +1168,10 @@@ int tpm_release(struct inode *inode, st
  	struct tpm_chip *chip = file->private_data;
  
  	del_singleshot_timer_sync(&chip->user_read_timer);
- 	flush_work_sync(&chip->work);
+ 	flush_work(&chip->work);
  	file->private_data = NULL;
  	atomic_set(&chip->data_pending, 0);
 -	kfree(chip->data_buffer);
 +	kzfree(chip->data_buffer);
  	clear_bit(0, &chip->is_open);
  	put_device(chip->dev);
  	return 0;
@@@ -1221,8 -1225,9 +1221,8 @@@ ssize_t tpm_read(struct file *file, cha
  	int rc;
  
  	del_singleshot_timer_sync(&chip->user_read_timer);
- 	flush_work_sync(&chip->work);
+ 	flush_work(&chip->work);
  	ret_size = atomic_read(&chip->data_pending);
 -	atomic_set(&chip->data_pending, 0);
  	if (ret_size > 0) {	/* relay data */
  		ssize_t orig_ret_size = ret_size;
  		if (size < ret_size)
diff --cc drivers/thermal/thermal_sys.c
index 47498b871903,67789b8345d2..d552a96f08cd
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@@ -703,19 -694,84 +703,16 @@@ thermal_remove_hwmon_sysfs(struct therm
  static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
  					    int delay)
  {
- 	cancel_delayed_work(&(tz->poll_queue));
- 
- 	if (!delay)
- 		return;
- 
  	if (delay > 1000)
- 		queue_delayed_work(system_freezable_wq, &(tz->poll_queue),
- 				      round_jiffies(msecs_to_jiffies(delay)));
+ 		mod_delayed_work(system_freezable_wq, &tz->poll_queue,
+ 				 round_jiffies(msecs_to_jiffies(delay)));
+ 	else if (delay)
+ 		mod_delayed_work(system_freezable_wq, &tz->poll_queue,
+ 				 msecs_to_jiffies(delay));
  	else
- 		queue_delayed_work(system_freezable_wq, &(tz->poll_queue),
- 				      msecs_to_jiffies(delay));
+ 		cancel_delayed_work(&tz->poll_queue);
  }
  
 -static void thermal_zone_device_passive(struct thermal_zone_device *tz,
 -					int temp, int trip_temp, int trip)
 -{
 -	int trend = 0;
 -	struct thermal_cooling_device_instance *instance;
 -	struct thermal_cooling_device *cdev;
 -	long state, max_state;
 -
 -	/*
 -	 * Above Trip?
 -	 * -----------
 -	 * Calculate the thermal trend (using the passive cooling equation)
 -	 * and modify the performance limit for all passive cooling devices
 -	 * accordingly.  Note that we assume symmetry.
 -	 */
 -	if (temp >= trip_temp) {
 -		tz->passive = true;
 -
 -		trend = (tz->tc1 * (temp - tz->last_temperature)) +
 -			(tz->tc2 * (temp - trip_temp));
 -
 -		/* Heating up? */
 -		if (trend > 0) {
 -			list_for_each_entry(instance, &tz->cooling_devices,
 -					    node) {
 -				if (instance->trip != trip)
 -					continue;
 -				cdev = instance->cdev;
 -				cdev->ops->get_cur_state(cdev, &state);
 -				cdev->ops->get_max_state(cdev, &max_state);
 -				if (state++ < max_state)
 -					cdev->ops->set_cur_state(cdev, state);
 -			}
 -		} else if (trend < 0) { /* Cooling off? */
 -			list_for_each_entry(instance, &tz->cooling_devices,
 -					    node) {
 -				if (instance->trip != trip)
 -					continue;
 -				cdev = instance->cdev;
 -				cdev->ops->get_cur_state(cdev, &state);
 -				cdev->ops->get_max_state(cdev, &max_state);
 -				if (state > 0)
 -					cdev->ops->set_cur_state(cdev, --state);
 -			}
 -		}
 -		return;
 -	}
 -
 -	/*
 -	 * Below Trip?
 -	 * -----------
 -	 * Implement passive cooling hysteresis to slowly increase performance
 -	 * and avoid thrashing around the passive trip point.  Note that we
 -	 * assume symmetry.
 -	 */
 -	list_for_each_entry(instance, &tz->cooling_devices, node) {
 -		if (instance->trip != trip)
 -			continue;
 -		cdev = instance->cdev;
 -		cdev->ops->get_cur_state(cdev, &state);
 -		cdev->ops->get_max_state(cdev, &max_state);
 -		if (state > 0)
 -			cdev->ops->set_cur_state(cdev, --state);
 -		if (state == 0)
 -			tz->passive = false;
 -	}
 -}
 -
  static void thermal_zone_device_check(struct work_struct *work)
  {
  	struct thermal_zone_device *tz = container_of(work, struct