diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-09-07 14:33:47 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-07 19:31:32 -0700 |
| commit | 0f0800f17a60816141f138a422477dc936262c42 (patch) | |
| tree | f21b866ac5d37d350c7754de2c3ade09be94e927 /drivers/staging/solo6x10 | |
| parent | d6835e8417554bfff40ba9603299f60de66fdf0a (diff) | |
staging: Bulk convert the semaphore mess
init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert
staging users.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/solo6x10')
| -rw-r--r-- | drivers/staging/solo6x10/solo6010-i2c.c | 2 | ||||
| -rw-r--r-- | drivers/staging/solo6x10/solo6010-p2m.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/solo6x10/solo6010-i2c.c b/drivers/staging/solo6x10/solo6010-i2c.c index 2bb86fa9e9e8..cadd5120d575 100644 --- a/drivers/staging/solo6x10/solo6010-i2c.c +++ b/drivers/staging/solo6x10/solo6010-i2c.c @@ -284,7 +284,7 @@ int solo_i2c_init(struct solo6010_dev *solo_dev) solo_dev->i2c_id = -1; solo_dev->i2c_state = IIC_STATE_IDLE; init_waitqueue_head(&solo_dev->i2c_wait); - init_MUTEX(&solo_dev->i2c_sem); + sema_init(&solo_dev->i2c_sem, 1); for (i = 0; i < SOLO_I2C_ADAPTERS; i++) { struct i2c_adapter *adap = &solo_dev->i2c_adap[i]; diff --git a/drivers/staging/solo6x10/solo6010-p2m.c b/drivers/staging/solo6x10/solo6010-p2m.c index 1b81f069c7f5..7ed3ed4b8f7e 100644 --- a/drivers/staging/solo6x10/solo6010-p2m.c +++ b/drivers/staging/solo6x10/solo6010-p2m.c @@ -188,7 +188,7 @@ int solo_p2m_init(struct solo6010_dev *solo_dev) for (i = 0; i < SOLO_NR_P2M; i++) { p2m_dev = &solo_dev->p2m_dev[i]; - init_MUTEX(&p2m_dev->sem); + sema_init(&p2m_dev->sem, 1); init_completion(&p2m_dev->completion); solo_reg_write(solo_dev, SOLO_P2M_DES_ADR(i), |