1 files changed, 58 insertions, 70 deletions

diff --git a/drivers/media/dvb/frontends/dib9000.c b/drivers/media/dvb/frontends/dib9000.c
index 0661da919b50..6201c59a78dd 100644
--- a/drivers/media/dvb/frontends/dib9000.c
+++ b/drivers/media/dvb/frontends/dib9000.c
@@ -31,13 +31,6 @@ struct i2c_device {
         u8 *i2c_write_buffer;
 };
 
-/* lock */
-#define DIB_LOCK struct mutex
-#define DibAcquireLock(lock) mutex_lock_interruptible(lock)
-#define DibReleaseLock(lock) mutex_unlock(lock)
-#define DibInitLock(lock) mutex_init(lock)
-#define DibFreeLock(lock)
-
 struct dib9000_pid_ctrl {
 #define DIB9000_PID_FILTER_CTRL 0
 #define DIB9000_PID_FILTER      1
@@ -82,11 +75,11 @@ struct dib9000_state {
                         } fe_mm[18];
                         u8 memcmd;
 
-                        DIB_LOCK mbx_if_lock;   /* to protect read/write operations */
-                        DIB_LOCK mbx_lock;      /* to protect the whole mailbox handling */
+                        struct mutex mbx_if_lock;       /* to protect read/write operations */
+                        struct mutex mbx_lock;  /* to protect the whole mailbox handling */
 
-                        DIB_LOCK mem_lock;      /* to protect the memory accesses */
-                        DIB_LOCK mem_mbx_lock;  /* to protect the memory-based mailbox */
+                        struct mutex mem_lock;  /* to protect the memory accesses */
+                        struct mutex mem_mbx_lock;      /* to protect the memory-based mailbox */
 
 #define MBX_MAX_WORDS (256 - 200 - 2)
 #define DIB9000_MSG_CACHE_SIZE 2
@@ -108,7 +101,7 @@ struct dib9000_state {
         struct i2c_msg msg[2];
         u8 i2c_write_buffer[255];
         u8 i2c_read_buffer[255];
-        DIB_LOCK demod_lock;
+        struct mutex demod_lock;
         u8 get_frontend_internal;
         struct dib9000_pid_ctrl pid_ctrl[10];
         s8 pid_ctrl_index; /* -1: empty list; -2: do not use the list */
@@ -446,13 +439,13 @@ static int dib9000_risc_mem_read(struct dib9000_state *state, u8 cmd, u8 * b, u1
         if (!state->platform.risc.fw_is_running)
                 return -EIO;
 
-        if (DibAcquireLock(&state->platform.risc.mem_lock) < 0) {
+        if (mutex_lock_interruptible(&state->platform.risc.mem_lock) < 0) {
                 dprintk("could not get the lock");
                 return -EINTR;
         }
         dib9000_risc_mem_setup(state, cmd | 0x80);
         dib9000_risc_mem_read_chunks(state, b, len);
-        DibReleaseLock(&state->platform.risc.mem_lock);
+        mutex_unlock(&state->platform.risc.mem_lock);
         return 0;
 }
 
@@ -462,13 +455,13 @@ static int dib9000_risc_mem_write(struct dib9000_state *state, u8 cmd, const u8
         if (!state->platform.risc.fw_is_running)
                 return -EIO;
 
-        if (DibAcquireLock(&state->platform.risc.mem_lock) < 0) {
+        if (mutex_lock_interruptible(&state->platform.risc.mem_lock) < 0) {
                 dprintk("could not get the lock");
                 return -EINTR;
         }
         dib9000_risc_mem_setup(state, cmd);
         dib9000_risc_mem_write_chunks(state, b, m->size);
-        DibReleaseLock(&state->platform.risc.mem_lock);
+        mutex_unlock(&state->platform.risc.mem_lock);
         return 0;
 }
 
@@ -537,7 +530,7 @@ static int dib9000_mbx_send_attr(struct dib9000_state *state, u8 id, u16 * data,
         if (!state->platform.risc.fw_is_running)
                 return -EINVAL;
 
-        if (DibAcquireLock(&state->platform.risc.mbx_if_lock) < 0) {
+        if (mutex_lock_interruptible(&state->platform.risc.mbx_if_lock) < 0) {
                 dprintk("could not get the lock");
                 return -EINTR;
         }
@@ -584,7 +577,7 @@ static int dib9000_mbx_send_attr(struct dib9000_state *state, u8 id, u16 * data,
         ret = (u8) dib9000_write_word_attr(state, 1043, 1 << 14, attr);
 
 out:
-        DibReleaseLock(&state->platform.risc.mbx_if_lock);
+        mutex_unlock(&state->platform.risc.mbx_if_lock);
 
         return ret;
 }
@@ -602,7 +595,7 @@ static u8 dib9000_mbx_read(struct dib9000_state *state, u16 * data, u8 risc_id,
         if (!state->platform.risc.fw_is_running)
                 return 0;
 
-        if (DibAcquireLock(&state->platform.risc.mbx_if_lock) < 0) {
+        if (mutex_lock_interruptible(&state->platform.risc.mbx_if_lock) < 0) {
                 dprintk("could not get the lock");
                 return 0;
         }
@@ -643,7 +636,7 @@ static u8 dib9000_mbx_read(struct dib9000_state *state, u16 * data, u8 risc_id,
         /* Update register nb_mes_in_TX */
         dib9000_write_word_attr(state, 1028 + mc_base, 1 << 14, attr);
 
-        DibReleaseLock(&state->platform.risc.mbx_if_lock);
+        mutex_unlock(&state->platform.risc.mbx_if_lock);
 
         return size + 1;
 }
@@ -712,7 +705,7 @@ static int dib9000_mbx_process(struct dib9000_state *state, u16 attr)
         if (!state->platform.risc.fw_is_running)
                 return -1;
 
-        if (DibAcquireLock(&state->platform.risc.mbx_lock) < 0) {
+        if (mutex_lock_interruptible(&state->platform.risc.mbx_lock) < 0) {
                 dprintk("could not get the lock");
                 return -1;
         }
@@ -723,7 +716,7 @@ static int dib9000_mbx_process(struct dib9000_state *state, u16 attr)
         dib9000_read_word_attr(state, 1229, attr);      /* Clear the IRQ */
 /*      if (tmp) */
 /*              dprintk( "cleared IRQ: %x", tmp); */
-        DibReleaseLock(&state->platform.risc.mbx_lock);
+        mutex_unlock(&state->platform.risc.mbx_lock);
 
         return ret;
 }
@@ -1192,7 +1185,7 @@ static int dib9000_fw_get_channel(struct dvb_frontend *fe)
         struct dibDVBTChannel *ch;
         int ret = 0;
 
-        if (DibAcquireLock(&state->platform.risc.mem_mbx_lock) < 0) {
+        if (mutex_lock_interruptible(&state->platform.risc.mem_mbx_lock) < 0) {
                 dprintk("could not get the lock");
                 return -EINTR;
         }
@@ -1322,7 +1315,7 @@ static int dib9000_fw_get_channel(struct dvb_frontend *fe)
         }
 
 error:
-        DibReleaseLock(&state->platform.risc.mem_mbx_lock);
+        mutex_unlock(&state->platform.risc.mem_mbx_lock);
         return ret;
 }
 
@@ -1677,7 +1670,7 @@ static int dib9000_fw_component_bus_xfer(struct i2c_adapter *i2c_adap, struct i2
                 p[12] = 0;
         }
 
-        if (DibAcquireLock(&state->platform.risc.mem_mbx_lock) < 0) {
+        if (mutex_lock_interruptible(&state->platform.risc.mem_mbx_lock) < 0) {
                 dprintk("could not get the lock");
                 return 0;
         }
@@ -1691,7 +1684,7 @@ static int dib9000_fw_component_bus_xfer(struct i2c_adapter *i2c_adap, struct i2
 
         /* do the transaction */
         if (dib9000_fw_memmbx_sync(state, FE_SYNC_COMPONENT_ACCESS) < 0) {
-                DibReleaseLock(&state->platform.risc.mem_mbx_lock);
+                mutex_unlock(&state->platform.risc.mem_mbx_lock);
                 return 0;
         }
 
@@ -1699,7 +1692,7 @@ static int dib9000_fw_component_bus_xfer(struct i2c_adapter *i2c_adap, struct i2
         if ((num > 1) && (msg[1].flags & I2C_M_RD))
                 dib9000_risc_mem_read(state, FE_MM_RW_COMPONENT_ACCESS_BUFFER, msg[1].buf, msg[1].len);
 
-        DibReleaseLock(&state->platform.risc.mem_mbx_lock);
+        mutex_unlock(&state->platform.risc.mem_mbx_lock);
 
         return num;
 }
@@ -1788,7 +1781,7 @@ int dib9000_fw_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff)
                 return 0;
         }
 
-        if (DibAcquireLock(&state->demod_lock) < 0) {
+        if (mutex_lock_interruptible(&state->demod_lock) < 0) {
                 dprintk("could not get the lock");
                 return -EINTR;
         }
@@ -1798,7 +1791,7 @@ int dib9000_fw_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff)
 
         dprintk("PID filter enabled %d", onoff);
         ret = dib9000_write_word(state, 294 + 1, val);
-        DibReleaseLock(&state->demod_lock);
+        mutex_unlock(&state->demod_lock);
         return ret;
 
 }
@@ -1823,14 +1816,14 @@ int dib9000_fw_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff)
                 return 0;
         }
 
-        if (DibAcquireLock(&state->demod_lock) < 0) {
+        if (mutex_lock_interruptible(&state->demod_lock) < 0) {
                 dprintk("could not get the lock");
                 return -EINTR;
         }
         dprintk("Index %x, PID %d, OnOff %d", id, pid, onoff);
         ret = dib9000_write_word(state, 300 + 1 + id,
                         onoff ? (1 << 13) | pid : 0);
-        DibReleaseLock(&state->demod_lock);
+        mutex_unlock(&state->demod_lock);
         return ret;
 }
 EXPORT_SYMBOL(dib9000_fw_pid_filter);
@@ -1850,11 +1843,6 @@ static void dib9000_release(struct dvb_frontend *demod)
         for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (st->fe[index_frontend] != NULL); index_frontend++)
                 dvb_frontend_detach(st->fe[index_frontend]);
 
-        DibFreeLock(&state->platform.risc.mbx_if_lock);
-        DibFreeLock(&state->platform.risc.mbx_lock);
-        DibFreeLock(&state->platform.risc.mem_lock);
-        DibFreeLock(&state->platform.risc.mem_mbx_lock);
-        DibFreeLock(&state->demod_lock);
         dibx000_exit_i2c_master(&st->i2c_master);
 
         i2c_del_adapter(&st->tuner_adap);
@@ -1874,7 +1862,7 @@ static int dib9000_sleep(struct dvb_frontend *fe)
         u8 index_frontend;
         int ret = 0;
 
-        if (DibAcquireLock(&state->demod_lock) < 0) {
+        if (mutex_lock_interruptible(&state->demod_lock) < 0) {
                 dprintk("could not get the lock");
                 return -EINTR;
         }
@@ -1886,7 +1874,7 @@ static int dib9000_sleep(struct dvb_frontend *fe)
         ret = dib9000_mbx_send(state, OUT_MSG_FE_SLEEP, NULL, 0);
 
 error:
-        DibReleaseLock(&state->demod_lock);
+        mutex_unlock(&state->demod_lock);
         return ret;
 }
 
@@ -1904,7 +1892,7 @@ static int dib9000_get_frontend(struct dvb_frontend *fe)
         int ret = 0;
 
         if (state->get_frontend_internal == 0) {
-                if (DibAcquireLock(&state->demod_lock) < 0) {
+                if (mutex_lock_interruptible(&state->demod_lock) < 0) {
                         dprintk("could not get the lock");
                         return -EINTR;
                 }
@@ -1963,7 +1951,7 @@ static int dib9000_get_frontend(struct dvb_frontend *fe)
 
 return_value:
         if (state->get_frontend_internal == 0)
-                DibReleaseLock(&state->demod_lock);
+                mutex_unlock(&state->demod_lock);
         return ret;
 }
 
@@ -2011,7 +1999,7 @@ static int dib9000_set_frontend(struct dvb_frontend *fe)
         }
 
         state->pid_ctrl_index = -1; /* postpone the pid filtering cmd */
-        if (DibAcquireLock(&state->demod_lock) < 0) {
+        if (mutex_lock_interruptible(&state->demod_lock) < 0) {
                 dprintk("could not get the lock");
                 return 0;
         }
@@ -2080,7 +2068,7 @@ static int dib9000_set_frontend(struct dvb_frontend *fe)
         /* check the tune result */
         if (exit_condition == 1) {      /* tune failed */
                 dprintk("tune failed");
-                DibReleaseLock(&state->demod_lock);
+                mutex_unlock(&state->demod_lock);
                 /* tune failed; put all the pid filtering cmd to junk */
                 state->pid_ctrl_index = -1;
                 return 0;
@@ -2136,7 +2124,7 @@ static int dib9000_set_frontend(struct dvb_frontend *fe)
         /* turn off the diversity for the last frontend */
         dib9000_fw_set_diversity_in(state->fe[index_frontend - 1], 0);
 
-        DibReleaseLock(&state->demod_lock);
+        mutex_unlock(&state->demod_lock);
         if (state->pid_ctrl_index >= 0) {
                 u8 index_pid_filter_cmd;
                 u8 pid_ctrl_index = state->pid_ctrl_index;
@@ -2174,7 +2162,7 @@ static int dib9000_read_status(struct dvb_frontend *fe, fe_status_t * stat)
         u8 index_frontend;
         u16 lock = 0, lock_slave = 0;
 
-        if (DibAcquireLock(&state->demod_lock) < 0) {
+        if (mutex_lock_interruptible(&state->demod_lock) < 0) {
                 dprintk("could not get the lock");
                 return -EINTR;
         }
@@ -2196,7 +2184,7 @@ static int dib9000_read_status(struct dvb_frontend *fe, fe_status_t * stat)
         if ((lock & 0x0008) || (lock_slave & 0x0008))
                 *stat |= FE_HAS_LOCK;
 
-        DibReleaseLock(&state->demod_lock);
+        mutex_unlock(&state->demod_lock);
 
         return 0;
 }
@@ -2207,30 +2195,30 @@ static int dib9000_read_ber(struct dvb_frontend *fe, u32 * ber)
         u16 *c;
         int ret = 0;
 
-        if (DibAcquireLock(&state->demod_lock) < 0) {
+        if (mutex_lock_interruptible(&state->demod_lock) < 0) {
                 dprintk("could not get the lock");
                 return -EINTR;
         }
-        if (DibAcquireLock(&state->platform.risc.mem_mbx_lock) < 0) {
+        if (mutex_lock_interruptible(&state->platform.risc.mem_mbx_lock) < 0) {
                 dprintk("could not get the lock");
                 ret = -EINTR;
                 goto error;
         }
         if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {
-                DibReleaseLock(&state->platform.risc.mem_mbx_lock);
+                mutex_unlock(&state->platform.risc.mem_mbx_lock);
                 ret = -EIO;
                 goto error;
         }
         dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR,
                         state->i2c_read_buffer, 16 * 2);
-        DibReleaseLock(&state->platform.risc.mem_mbx_lock);
+        mutex_unlock(&state->platform.risc.mem_mbx_lock);
 
         c = (u16 *)state->i2c_read_buffer;
 
         *ber = c[10] << 16 | c[11];
 
 error:
-        DibReleaseLock(&state->demod_lock);
+        mutex_unlock(&state->demod_lock);
         return ret;
 }
 
@@ -2242,7 +2230,7 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
         u16 val;
         int ret = 0;
 
-        if (DibAcquireLock(&state->demod_lock) < 0) {
+        if (mutex_lock_interruptible(&state->demod_lock) < 0) {
                 dprintk("could not get the lock");
                 return -EINTR;
         }
@@ -2255,18 +2243,18 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
                         *strength += val;
         }
 
-        if (DibAcquireLock(&state->platform.risc.mem_mbx_lock) < 0) {
+        if (mutex_lock_interruptible(&state->platform.risc.mem_mbx_lock) < 0) {
                 dprintk("could not get the lock");
                 ret = -EINTR;
                 goto error;
         }
         if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {
-                DibReleaseLock(&state->platform.risc.mem_mbx_lock);
+                mutex_unlock(&state->platform.risc.mem_mbx_lock);
                 ret = -EIO;
                 goto error;
         }
         dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2);
-        DibReleaseLock(&state->platform.risc.mem_mbx_lock);
+        mutex_unlock(&state->platform.risc.mem_mbx_lock);
 
         val = 65535 - c[4];
         if (val > 65535 - *strength)
@@ -2275,7 +2263,7 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
                 *strength += val;
 
 error:
-        DibReleaseLock(&state->demod_lock);
+        mutex_unlock(&state->demod_lock);
         return ret;
 }
 
@@ -2286,16 +2274,16 @@ static u32 dib9000_get_snr(struct dvb_frontend *fe)
         u32 n, s, exp;
         u16 val;
 
-        if (DibAcquireLock(&state->platform.risc.mem_mbx_lock) < 0) {
+        if (mutex_lock_interruptible(&state->platform.risc.mem_mbx_lock) < 0) {
                 dprintk("could not get the lock");
                 return 0;
         }
         if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {
-                DibReleaseLock(&state->platform.risc.mem_mbx_lock);
+                mutex_unlock(&state->platform.risc.mem_mbx_lock);
                 return 0;
         }
         dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2);
-        DibReleaseLock(&state->platform.risc.mem_mbx_lock);
+        mutex_unlock(&state->platform.risc.mem_mbx_lock);
 
         val = c[7];
         n = (val >> 4) & 0xff;
@@ -2325,7 +2313,7 @@ static int dib9000_read_snr(struct dvb_frontend *fe, u16 * snr)
         u8 index_frontend;
         u32 snr_master;
 
-        if (DibAcquireLock(&state->demod_lock) < 0) {
+        if (mutex_lock_interruptible(&state->demod_lock) < 0) {
                 dprintk("could not get the lock");
                 return -EINTR;
         }
@@ -2339,7 +2327,7 @@ static int dib9000_read_snr(struct dvb_frontend *fe, u16 * snr)
         } else
                 *snr = 0;
 
-        DibReleaseLock(&state->demod_lock);
+        mutex_unlock(&state->demod_lock);
 
         return 0;
 }
@@ -2350,27 +2338,27 @@ static int dib9000_read_unc_blocks(struct dvb_frontend *fe, u32 * unc)
         u16 *c = (u16 *)state->i2c_read_buffer;
         int ret = 0;
 
-        if (DibAcquireLock(&state->demod_lock) < 0) {
+        if (mutex_lock_interruptible(&state->demod_lock) < 0) {
                 dprintk("could not get the lock");
                 return -EINTR;
         }
-        if (DibAcquireLock(&state->platform.risc.mem_mbx_lock) < 0) {
+        if (mutex_lock_interruptible(&state->platform.risc.mem_mbx_lock) < 0) {
                 dprintk("could not get the lock");
                 ret = -EINTR;
                 goto error;
         }
         if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {
-                DibReleaseLock(&state->platform.risc.mem_mbx_lock);
+                mutex_unlock(&state->platform.risc.mem_mbx_lock);
                 ret = -EIO;
                 goto error;
         }
         dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2);
-        DibReleaseLock(&state->platform.risc.mem_mbx_lock);
+        mutex_unlock(&state->platform.risc.mem_mbx_lock);
 
         *unc = c[12];
 
 error:
-        DibReleaseLock(&state->demod_lock);
+        mutex_unlock(&state->demod_lock);
         return ret;
 }
 
@@ -2513,11 +2501,11 @@ struct dvb_frontend *dib9000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, c
         st->gpio_val = DIB9000_GPIO_DEFAULT_VALUES;
         st->gpio_pwm_pos = DIB9000_GPIO_DEFAULT_PWM_POS;
 
-        DibInitLock(&st->platform.risc.mbx_if_lock);
-        DibInitLock(&st->platform.risc.mbx_lock);
-        DibInitLock(&st->platform.risc.mem_lock);
-        DibInitLock(&st->platform.risc.mem_mbx_lock);
-        DibInitLock(&st->demod_lock);
+        mutex_init(&st->platform.risc.mbx_if_lock);
+        mutex_init(&st->platform.risc.mbx_lock);
+        mutex_init(&st->platform.risc.mem_lock);
+        mutex_init(&st->platform.risc.mem_mbx_lock);
+        mutex_init(&st->demod_lock);
         st->get_frontend_internal = 0;
 
         st->pid_ctrl_index = -2;