On Tue, 07 Sep 2010 14:33:57 -0000, Thomas Gleixner wrote:
> The semaphore which protects the ADC is semantically a mutex. Use a
> real mutex.
>
> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: Jean Delvare <khali@xxxxxxxxxxxx>
> Cc: Ben Dooks <ben-linux@xxxxxxxxx>
> Cc: lm-sensors@xxxxxxxxxxxxxx
> ---
> drivers/hwmon/s3c-hwmon.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> Index: linux-2.6/drivers/hwmon/s3c-hwmon.c
> ===================================================================
> --- linux-2.6.orig/drivers/hwmon/s3c-hwmon.c
> +++ linux-2.6/drivers/hwmon/s3c-hwmon.c
> @@ -51,7 +51,7 @@ struct s3c_hwmon_attr {
> * @attr: The holders for the channel attributes.
> */
> struct s3c_hwmon {
> - struct semaphore lock;
> + struct mutex lock;
> struct s3c_adc_client *client;
> struct device *hwmon_dev;
>
> @@ -73,14 +73,14 @@ static int s3c_hwmon_read_ch(struct devi
> {
> int ret;
>
> - ret = down_interruptible(&hwmon->lock);
> + ret = mutex_lock_interruptible(&hwmon->lock);
> if (ret < 0)
> return ret;
>
> dev_dbg(dev, "reading channel %d\n", channel);
>
> ret = s3c_adc_read(hwmon->client, channel);
> - up(&hwmon->lock);
> + mutex_unlock(&hwmon->lock);
>
> return ret;
> }
> @@ -296,7 +296,7 @@ static int __devinit s3c_hwmon_probe(str
>
> platform_set_drvdata(dev, hwmon);
>
> - init_MUTEX(&hwmon->lock);
> + mutex_init(&hwmon->lock);
>
> /* Register with the core ADC driver. */
>
>
>
Applied, thanks.
--
Jean Delvare
_______________________________________________
lm-sensors mailing list
lm-sensors@xxxxxxxxxxxxxx
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
