diff options
| -rw-r--r-- | drivers/macintosh/windfarm_smu_sat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c index 797918d0e59c..7f2be4baaeda 100644 --- a/drivers/macintosh/windfarm_smu_sat.c +++ b/drivers/macintosh/windfarm_smu_sat.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/wait.h> | 14 | #include <linux/wait.h> |
| 15 | #include <linux/i2c.h> | 15 | #include <linux/i2c.h> |
| 16 | #include <linux/semaphore.h> | 16 | #include <linux/mutex.h> |
| 17 | #include <asm/prom.h> | 17 | #include <asm/prom.h> |
| 18 | #include <asm/smu.h> | 18 | #include <asm/smu.h> |
| 19 | #include <asm/pmac_low_i2c.h> | 19 | #include <asm/pmac_low_i2c.h> |
| @@ -36,7 +36,7 @@ | |||
| 36 | struct wf_sat { | 36 | struct wf_sat { |
| 37 | int nr; | 37 | int nr; |
| 38 | atomic_t refcnt; | 38 | atomic_t refcnt; |
| 39 | struct semaphore mutex; | 39 | struct mutex mutex; |
| 40 | unsigned long last_read; /* jiffies when cache last updated */ | 40 | unsigned long last_read; /* jiffies when cache last updated */ |
| 41 | u8 cache[16]; | 41 | u8 cache[16]; |
| 42 | struct i2c_client i2c; | 42 | struct i2c_client i2c; |
| @@ -163,7 +163,7 @@ static int wf_sat_get(struct wf_sensor *sr, s32 *value) | |||
| 163 | if (sat->i2c.adapter == NULL) | 163 | if (sat->i2c.adapter == NULL) |
| 164 | return -ENODEV; | 164 | return -ENODEV; |
| 165 | 165 | ||
| 166 | down(&sat->mutex); | 166 | mutex_lock(&sat->mutex); |
| 167 | if (time_after(jiffies, (sat->last_read + MAX_AGE))) { | 167 | if (time_after(jiffies, (sat->last_read + MAX_AGE))) { |
| 168 | err = wf_sat_read_cache(sat); | 168 | err = wf_sat_read_cache(sat); |
| 169 | if (err) | 169 | if (err) |
| @@ -182,7 +182,7 @@ static int wf_sat_get(struct wf_sensor *sr, s32 *value) | |||
| 182 | err = 0; | 182 | err = 0; |
| 183 | 183 | ||
| 184 | fail: | 184 | fail: |
| 185 | up(&sat->mutex); | 185 | mutex_unlock(&sat->mutex); |
| 186 | return err; | 186 | return err; |
| 187 | } | 187 | } |
| 188 | 188 | ||
| @@ -233,7 +233,7 @@ static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev) | |||
| 233 | sat->nr = -1; | 233 | sat->nr = -1; |
| 234 | sat->node = of_node_get(dev); | 234 | sat->node = of_node_get(dev); |
| 235 | atomic_set(&sat->refcnt, 0); | 235 | atomic_set(&sat->refcnt, 0); |
| 236 | init_MUTEX(&sat->mutex); | 236 | mutex_init(&sat->mutex); |
| 237 | sat->i2c.addr = (addr >> 1) & 0x7f; | 237 | sat->i2c.addr = (addr >> 1) & 0x7f; |
| 238 | sat->i2c.adapter = adapter; | 238 | sat->i2c.adapter = adapter; |
| 239 | sat->i2c.driver = &wf_sat_driver; | 239 | sat->i2c.driver = &wf_sat_driver; |
