diff options
author | Oliver Endriss <o.endriss@gmx.de> | 2007-07-13 10:54:35 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 13:24:46 -0400 |
commit | 260f8d7c4cda79b087a182eb03e8574ba41a171e (patch) | |
tree | b50799ad52d10badbda800a26def7da29321ea8a /drivers/media | |
parent | 0402a6c2aadbd5ff0e70a67f80a4907bf76792c6 (diff) |
V4L/DVB (5838): dvb-core: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22)
Fix signedness warnings (gcc 4.1.1, kernel 2.6.22).
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/dvb-core/dmxdev.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 12 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_demux.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c index 275df65fde99..5394de2e4ce0 100644 --- a/drivers/media/dvb/dvb-core/dmxdev.c +++ b/drivers/media/dvb/dvb-core/dmxdev.c | |||
@@ -97,7 +97,7 @@ static ssize_t dvb_dmxdev_buffer_read(struct dvb_ringbuffer *src, | |||
97 | if (avail > todo) | 97 | if (avail > todo) |
98 | avail = todo; | 98 | avail = todo; |
99 | 99 | ||
100 | ret = dvb_ringbuffer_read(src, buf, avail, 1); | 100 | ret = dvb_ringbuffer_read(src, (u8 *)buf, avail, 1); |
101 | if (ret < 0) | 101 | if (ret < 0) |
102 | break; | 102 | break; |
103 | 103 | ||
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c index 2a03bf53cb29..4fadddb264d6 100644 --- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c | |||
@@ -175,7 +175,7 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot, u8 * e | |||
175 | * @param nlen Number of bytes in needle. | 175 | * @param nlen Number of bytes in needle. |
176 | * @return Pointer into haystack needle was found at, or NULL if not found. | 176 | * @return Pointer into haystack needle was found at, or NULL if not found. |
177 | */ | 177 | */ |
178 | static u8 *findstr(u8 * haystack, int hlen, u8 * needle, int nlen) | 178 | static char *findstr(char * haystack, int hlen, char * needle, int nlen) |
179 | { | 179 | { |
180 | int i; | 180 | int i; |
181 | 181 | ||
@@ -482,7 +482,7 @@ static int dvb_ca_en50221_parse_attributes(struct dvb_ca_private *ca, int slot) | |||
482 | } | 482 | } |
483 | 483 | ||
484 | /* check it contains the correct DVB string */ | 484 | /* check it contains the correct DVB string */ |
485 | dvb_str = findstr(tuple, tupleLength, "DVB_CI_V", 8); | 485 | dvb_str = findstr((char *)tuple, tupleLength, "DVB_CI_V", 8); |
486 | if (dvb_str == NULL) | 486 | if (dvb_str == NULL) |
487 | return -EINVAL; | 487 | return -EINVAL; |
488 | if (tupleLength < ((dvb_str - (char *) tuple) + 12)) | 488 | if (tupleLength < ((dvb_str - (char *) tuple) + 12)) |
@@ -513,8 +513,8 @@ static int dvb_ca_en50221_parse_attributes(struct dvb_ca_private *ca, int slot) | |||
513 | ca->slot_info[slot].config_option = tuple[0] & 0x3f; | 513 | ca->slot_info[slot].config_option = tuple[0] & 0x3f; |
514 | 514 | ||
515 | /* OK, check it contains the correct strings */ | 515 | /* OK, check it contains the correct strings */ |
516 | if ((findstr(tuple, tupleLength, "DVB_HOST", 8) == NULL) || | 516 | if ((findstr((char *)tuple, tupleLength, "DVB_HOST", 8) == NULL) || |
517 | (findstr(tuple, tupleLength, "DVB_CI_MODULE", 13) == NULL)) | 517 | (findstr((char *)tuple, tupleLength, "DVB_CI_MODULE", 13) == NULL)) |
518 | break; | 518 | break; |
519 | 519 | ||
520 | got_cftableentry = 1; | 520 | got_cftableentry = 1; |
@@ -1300,7 +1300,7 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file, | |||
1300 | struct dvb_ca_private *ca = dvbdev->priv; | 1300 | struct dvb_ca_private *ca = dvbdev->priv; |
1301 | u8 slot, connection_id; | 1301 | u8 slot, connection_id; |
1302 | int status; | 1302 | int status; |
1303 | char fragbuf[HOST_LINK_BUF_SIZE]; | 1303 | u8 fragbuf[HOST_LINK_BUF_SIZE]; |
1304 | int fragpos = 0; | 1304 | int fragpos = 0; |
1305 | int fraglen; | 1305 | int fraglen; |
1306 | unsigned long timeout; | 1306 | unsigned long timeout; |
@@ -1486,7 +1486,7 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf, | |||
1486 | } | 1486 | } |
1487 | 1487 | ||
1488 | if ((status = dvb_ringbuffer_pkt_read(&ca->slot_info[slot].rx_buffer, idx, 2, | 1488 | if ((status = dvb_ringbuffer_pkt_read(&ca->slot_info[slot].rx_buffer, idx, 2, |
1489 | buf + pktlen, fraglen, 1)) < 0) { | 1489 | (u8 *)buf + pktlen, fraglen, 1)) < 0) { |
1490 | goto exit; | 1490 | goto exit; |
1491 | } | 1491 | } |
1492 | pktlen += fraglen; | 1492 | pktlen += fraglen; |
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c index 6d8d1c3df863..cb6987fce26c 100644 --- a/drivers/media/dvb/dvb-core/dvb_demux.c +++ b/drivers/media/dvb/dvb-core/dvb_demux.c | |||
@@ -1068,7 +1068,7 @@ static int dvbdmx_write(struct dmx_demux *demux, const char *buf, size_t count) | |||
1068 | 1068 | ||
1069 | if (mutex_lock_interruptible(&dvbdemux->mutex)) | 1069 | if (mutex_lock_interruptible(&dvbdemux->mutex)) |
1070 | return -ERESTARTSYS; | 1070 | return -ERESTARTSYS; |
1071 | dvb_dmx_swfilter(dvbdemux, buf, count); | 1071 | dvb_dmx_swfilter(dvbdemux, (u8 *)buf, count); |
1072 | mutex_unlock(&dvbdemux->mutex); | 1072 | mutex_unlock(&dvbdemux->mutex); |
1073 | 1073 | ||
1074 | if (signal_pending(current)) | 1074 | if (signal_pending(current)) |
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index f233d78bc364..a770a87b9a93 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h | |||
@@ -103,7 +103,7 @@ struct dvb_frontend_ops { | |||
103 | int (*tune)(struct dvb_frontend* fe, | 103 | int (*tune)(struct dvb_frontend* fe, |
104 | struct dvb_frontend_parameters* params, | 104 | struct dvb_frontend_parameters* params, |
105 | unsigned int mode_flags, | 105 | unsigned int mode_flags, |
106 | int *delay, | 106 | unsigned int *delay, |
107 | fe_status_t *status); | 107 | fe_status_t *status); |
108 | /* get frontend tuning algorithm from the module */ | 108 | /* get frontend tuning algorithm from the module */ |
109 | int (*get_frontend_algo)(struct dvb_frontend *fe); | 109 | int (*get_frontend_algo)(struct dvb_frontend *fe); |