diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-26 00:00:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-26 00:00:41 +0100 |
| commit | 04e780d9cc5d55b07286a5ecbc455c027a81ab7f (patch) | |
| tree | 5d92bce991e84f84468c7374eb292dd0a1682d13 /include | |
| parent | c04ee7fcbfba1471af90cf6407370efc779c1243 (diff) | |
| parent | 81a464838675307c9fc7909fc840f248ed2caed5 (diff) | |
Merge tag 'v3.10.3' into linux-linaro-lsk
This is the 3.10.3 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpu_cooling.h | 4 | ||||
| -rw-r--r-- | include/linux/iio/iio.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h index 282e27028418..a5d52eea8232 100644 --- a/include/linux/cpu_cooling.h +++ b/include/linux/cpu_cooling.h @@ -41,7 +41,7 @@ cpufreq_cooling_register(const struct cpumask *clip_cpus); */ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev); -unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int); +unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq); #else /* !CONFIG_CPU_THERMAL */ static inline struct thermal_cooling_device * cpufreq_cooling_register(const struct cpumask *clip_cpus) @@ -54,7 +54,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) return; } static inline -unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int) +unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq) { return THERMAL_CSTATE_INVALID; } diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h index 8d171f427632..3d35b7023591 100644 --- a/include/linux/iio/iio.h +++ b/include/linux/iio/iio.h @@ -211,8 +211,8 @@ struct iio_chan_spec { static inline bool iio_channel_has_info(const struct iio_chan_spec *chan, enum iio_chan_info_enum type) { - return (chan->info_mask_separate & type) | - (chan->info_mask_shared_by_type & type); + return (chan->info_mask_separate & BIT(type)) | + (chan->info_mask_shared_by_type & BIT(type)); } #define IIO_ST(si, rb, sb, sh) \ |