git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
media
/
dvb
/
ttpci
/
av7110_hw.c
diff --git
a/drivers/media/dvb/ttpci/av7110_hw.c
b/drivers/media/dvb/ttpci/av7110_hw.c
index
0bb6e74
..
37de2e8
100644
(file)
--- a/
drivers/media/dvb/ttpci/av7110_hw.c
+++ b/
drivers/media/dvb/ttpci/av7110_hw.c
@@
-34,7
+34,6
@@
#include <linux/string.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/string.h>
#include <linux/sched.h>
#include <linux/delay.h>
-#include <linux/byteorder/swabb.h>
#include <linux/smp_lock.h>
#include <linux/fs.h>
#include <linux/smp_lock.h>
#include <linux/fs.h>
@@
-327,10
+326,10
@@
int av7110_wait_msgstate(struct av7110 *av7110, u16 flags)
start = jiffies;
for (;;) {
err = time_after(jiffies, start + ARM_WAIT_FREE);
start = jiffies;
for (;;) {
err = time_after(jiffies, start + ARM_WAIT_FREE);
- if (
down
_interruptible(&av7110->dcomlock))
+ if (
mutex_lock
_interruptible(&av7110->dcomlock))
return -ERESTARTSYS;
stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
return -ERESTARTSYS;
stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
if ((stat & flags) == 0)
break;
if (err) {
if ((stat & flags) == 0)
break;
if (err) {
@@
-487,11
+486,11
@@
static int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
dprintk(1, "arm not ready.\n");
return -1;
}
dprintk(1, "arm not ready.\n");
return -1;
}
- if (
down
_interruptible(&av7110->dcomlock))
+ if (
mutex_lock
_interruptible(&av7110->dcomlock))
return -ERESTARTSYS;
ret = __av7110_send_fw_cmd(av7110, buf, length);
return -ERESTARTSYS;
ret = __av7110_send_fw_cmd(av7110, buf, length);
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
if (ret && ret!=-ERESTARTSYS)
printk(KERN_ERR "dvb-ttpci: %s(): av7110_send_fw_cmd error %d\n",
__FUNCTION__, ret);
if (ret && ret!=-ERESTARTSYS)
printk(KERN_ERR "dvb-ttpci: %s(): av7110_send_fw_cmd error %d\n",
__FUNCTION__, ret);
@@
-563,11
+562,11
@@
int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
return -1;
}
return -1;
}
- if (
down
_interruptible(&av7110->dcomlock))
+ if (
mutex_lock
_interruptible(&av7110->dcomlock))
return -ERESTARTSYS;
if ((err = __av7110_send_fw_cmd(av7110, request_buf, request_buf_len)) < 0) {
return -ERESTARTSYS;
if ((err = __av7110_send_fw_cmd(av7110, request_buf, request_buf_len)) < 0) {
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
printk(KERN_ERR "dvb-ttpci: av7110_fw_request error %d\n", err);
return err;
}
printk(KERN_ERR "dvb-ttpci: av7110_fw_request error %d\n", err);
return err;
}
@@
-579,7
+578,7
@@
int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
break;
if (err) {
printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", __FUNCTION__);
break;
if (err) {
printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", __FUNCTION__);
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
return -ETIMEDOUT;
}
#ifdef _NOHANDSHAKE
return -ETIMEDOUT;
}
#ifdef _NOHANDSHAKE
@@
-595,7
+594,7
@@
int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
break;
if (err) {
printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __FUNCTION__);
break;
if (err) {
printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __FUNCTION__);
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
return -ETIMEDOUT;
}
msleep(1);
return -ETIMEDOUT;
}
msleep(1);
@@
-606,12
+605,12
@@
int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
if (stat & GPMQOver) {
printk(KERN_ERR "%s: GPMQOver\n", __FUNCTION__);
stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
if (stat & GPMQOver) {
printk(KERN_ERR "%s: GPMQOver\n", __FUNCTION__);
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
return -1;
}
else if (stat & OSDQOver) {
printk(KERN_ERR "%s: OSDQOver\n", __FUNCTION__);
return -1;
}
else if (stat & OSDQOver) {
printk(KERN_ERR "%s: OSDQOver\n", __FUNCTION__);
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
return -1;
}
#endif
return -1;
}
#endif
@@
-619,7
+618,7
@@
int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
for (i = 0; i < reply_buf_len; i++)
reply_buf[i] = rdebi(av7110, DEBINOSWAP, COM_BUFF + 2 * i, 0, 2);
for (i = 0; i < reply_buf_len; i++)
reply_buf[i] = rdebi(av7110, DEBINOSWAP, COM_BUFF + 2 * i, 0, 2);
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
return 0;
}
return 0;
}
@@
-735,7
+734,7
@@
static int FlushText(struct av7110 *av7110)
unsigned long start;
int err;
unsigned long start;
int err;
- if (
down
_interruptible(&av7110->dcomlock))
+ if (
mutex_lock
_interruptible(&av7110->dcomlock))
return -ERESTARTSYS;
start = jiffies;
while (1) {
return -ERESTARTSYS;
start = jiffies;
while (1) {
@@
-745,12
+744,12
@@
static int FlushText(struct av7110 *av7110)
if (err) {
printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for BUFF1_BASE == 0\n",
__FUNCTION__);
if (err) {
printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for BUFF1_BASE == 0\n",
__FUNCTION__);
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
return -ETIMEDOUT;
}
msleep(1);
}
return -ETIMEDOUT;
}
msleep(1);
}
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
return 0;
}
return 0;
}
@@
-761,7
+760,7
@@
static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
int length = strlen(buf) + 1;
u16 cbuf[5] = { (COMTYPE_OSD << 8) + DText, 3, win, x, y };
int length = strlen(buf) + 1;
u16 cbuf[5] = { (COMTYPE_OSD << 8) + DText, 3, win, x, y };
- if (
down
_interruptible(&av7110->dcomlock))
+ if (
mutex_lock
_interruptible(&av7110->dcomlock))
return -ERESTARTSYS;
start = jiffies;
return -ERESTARTSYS;
start = jiffies;
@@
-772,7
+771,7
@@
static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
if (ret) {
printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for BUFF1_BASE == 0\n",
__FUNCTION__);
if (ret) {
printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for BUFF1_BASE == 0\n",
__FUNCTION__);
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
return -ETIMEDOUT;
}
msleep(1);
return -ETIMEDOUT;
}
msleep(1);
@@
-786,7
+785,7
@@
static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
if (ret) {
printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for HANDSHAKE_REG\n",
__FUNCTION__);
if (ret) {
printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for HANDSHAKE_REG\n",
__FUNCTION__);
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
return -ETIMEDOUT;
}
msleep(1);
return -ETIMEDOUT;
}
msleep(1);
@@
-798,7
+797,7
@@
static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
if (length & 1)
wdebi(av7110, DEBINOSWAP, BUFF1_BASE + i * 2, 0, 2);
ret = __av7110_send_fw_cmd(av7110, cbuf, 5);
if (length & 1)
wdebi(av7110, DEBINOSWAP, BUFF1_BASE + i * 2, 0, 2);
ret = __av7110_send_fw_cmd(av7110, cbuf, 5);
-
up
(&av7110->dcomlock);
+
mutex_unlock
(&av7110->dcomlock);
if (ret && ret!=-ERESTARTSYS)
printk(KERN_ERR "dvb-ttpci: WriteText error %d\n", ret);
return ret;
if (ret && ret!=-ERESTARTSYS)
printk(KERN_ERR "dvb-ttpci: WriteText error %d\n", ret);
return ret;
@@
-1062,7
+1061,7
@@
int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc)
{
int ret;
{
int ret;
- if (
down_interruptible(&av7110->osd_sema
))
+ if (
mutex_lock_interruptible(&av7110->osd_mutex
))
return -ERESTARTSYS;
switch (dc->cmd) {
return -ERESTARTSYS;
switch (dc->cmd) {
@@
-1198,7
+1197,7
@@
int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc)
break;
}
break;
}
-
up(&av7110->osd_sema
);
+
mutex_unlock(&av7110->osd_mutex
);
if (ret==-ERESTARTSYS)
dprintk(1, "av7110_osd_cmd(%d) returns with -ERESTARTSYS\n",dc->cmd);
else if (ret)
if (ret==-ERESTARTSYS)
dprintk(1, "av7110_osd_cmd(%d) returns with -ERESTARTSYS\n",dc->cmd);
else if (ret)