V4L/DVB (7856): cx18/: possible cleanups
This patch contains the following possible cleanups: - cx18-i2c.c should #include "cx18-i2c.h" for getting the prototypes of it's global functions - make the following needlessly global functions static: - cx18-fileops.c:cx18_claim_stream() - cx18-fileops.c:cx18_release_stream() - cx18-queue.c:cx18_queue_move() - remove the following unused functions: - cx18-driver.c:cx18_waitq() - cx18-queue.c:cx18_buf_copy_from_user() Signed-off-by: Adrian Bunk <bunk@kernel.org> Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
3f98387efa
commit
50510993e0
7 changed files with 6 additions and 41 deletions
|
@ -164,16 +164,6 @@ MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
MODULE_VERSION(CX18_VERSION);
|
MODULE_VERSION(CX18_VERSION);
|
||||||
|
|
||||||
int cx18_waitq(wait_queue_head_t *waitq)
|
|
||||||
{
|
|
||||||
DEFINE_WAIT(wait);
|
|
||||||
|
|
||||||
prepare_to_wait(waitq, &wait, TASK_INTERRUPTIBLE);
|
|
||||||
schedule();
|
|
||||||
finish_wait(waitq, &wait);
|
|
||||||
return signal_pending(current) ? -EINTR : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Generic utility functions */
|
/* Generic utility functions */
|
||||||
int cx18_msleep_timeout(unsigned int msecs, int intr)
|
int cx18_msleep_timeout(unsigned int msecs, int intr)
|
||||||
{
|
{
|
||||||
|
|
|
@ -444,9 +444,6 @@ extern spinlock_t cx18_cards_lock;
|
||||||
/* Return non-zero if a signal is pending */
|
/* Return non-zero if a signal is pending */
|
||||||
int cx18_msleep_timeout(unsigned int msecs, int intr);
|
int cx18_msleep_timeout(unsigned int msecs, int intr);
|
||||||
|
|
||||||
/* Wait on queue, returns -EINTR if interrupted */
|
|
||||||
int cx18_waitq(wait_queue_head_t *waitq);
|
|
||||||
|
|
||||||
/* Read Hauppauge eeprom */
|
/* Read Hauppauge eeprom */
|
||||||
struct tveeprom; /* forward reference */
|
struct tveeprom; /* forward reference */
|
||||||
void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv);
|
void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv);
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
associated VBI streams are also automatically claimed.
|
associated VBI streams are also automatically claimed.
|
||||||
Possible error returns: -EBUSY if someone else has claimed
|
Possible error returns: -EBUSY if someone else has claimed
|
||||||
the stream or 0 on success. */
|
the stream or 0 on success. */
|
||||||
int cx18_claim_stream(struct cx18_open_id *id, int type)
|
static int cx18_claim_stream(struct cx18_open_id *id, int type)
|
||||||
{
|
{
|
||||||
struct cx18 *cx = id->cx;
|
struct cx18 *cx = id->cx;
|
||||||
struct cx18_stream *s = &cx->streams[type];
|
struct cx18_stream *s = &cx->streams[type];
|
||||||
|
@ -87,7 +87,7 @@ int cx18_claim_stream(struct cx18_open_id *id, int type)
|
||||||
|
|
||||||
/* This function releases a previously claimed stream. It will take into
|
/* This function releases a previously claimed stream. It will take into
|
||||||
account associated VBI streams. */
|
account associated VBI streams. */
|
||||||
void cx18_release_stream(struct cx18_stream *s)
|
static void cx18_release_stream(struct cx18_stream *s)
|
||||||
{
|
{
|
||||||
struct cx18 *cx = s->cx;
|
struct cx18 *cx = s->cx;
|
||||||
struct cx18_stream *s_vbi;
|
struct cx18_stream *s_vbi;
|
||||||
|
|
|
@ -34,12 +34,3 @@ void cx18_stop_capture(struct cx18_open_id *id, int gop_end);
|
||||||
void cx18_mute(struct cx18 *cx);
|
void cx18_mute(struct cx18 *cx);
|
||||||
void cx18_unmute(struct cx18 *cx);
|
void cx18_unmute(struct cx18 *cx);
|
||||||
|
|
||||||
/* Utilities */
|
|
||||||
|
|
||||||
/* Try to claim a stream for the filehandle. Return 0 on success,
|
|
||||||
-EBUSY if stream already claimed. Once a stream is claimed, it
|
|
||||||
remains claimed until the associated filehandle is closed. */
|
|
||||||
int cx18_claim_stream(struct cx18_open_id *id, int type);
|
|
||||||
|
|
||||||
/* Release a previously claimed stream. */
|
|
||||||
void cx18_release_stream(struct cx18_stream *s);
|
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include "cx18-cards.h"
|
#include "cx18-cards.h"
|
||||||
#include "cx18-gpio.h"
|
#include "cx18-gpio.h"
|
||||||
#include "cx18-av-core.h"
|
#include "cx18-av-core.h"
|
||||||
|
#include "cx18-i2c.h"
|
||||||
|
|
||||||
#include <media/ir-kbd-i2c.h>
|
#include <media/ir-kbd-i2c.h>
|
||||||
|
|
||||||
|
|
|
@ -26,17 +26,6 @@
|
||||||
#include "cx18-queue.h"
|
#include "cx18-queue.h"
|
||||||
#include "cx18-scb.h"
|
#include "cx18-scb.h"
|
||||||
|
|
||||||
int cx18_buf_copy_from_user(struct cx18_stream *s, struct cx18_buffer *buf,
|
|
||||||
const char __user *src, int copybytes)
|
|
||||||
{
|
|
||||||
if (s->buf_size - buf->bytesused < copybytes)
|
|
||||||
copybytes = s->buf_size - buf->bytesused;
|
|
||||||
if (copy_from_user(buf->buf + buf->bytesused, src, copybytes))
|
|
||||||
return -EFAULT;
|
|
||||||
buf->bytesused += copybytes;
|
|
||||||
return copybytes;
|
|
||||||
}
|
|
||||||
|
|
||||||
void cx18_buf_swap(struct cx18_buffer *buf)
|
void cx18_buf_swap(struct cx18_buffer *buf)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -159,8 +148,9 @@ static void cx18_queue_move_buf(struct cx18_stream *s, struct cx18_queue *from,
|
||||||
-ENOMEM is returned if the buffers could not be obtained, 0 if all
|
-ENOMEM is returned if the buffers could not be obtained, 0 if all
|
||||||
buffers where obtained from the 'from' list and if non-zero then
|
buffers where obtained from the 'from' list and if non-zero then
|
||||||
the number of stolen buffers is returned. */
|
the number of stolen buffers is returned. */
|
||||||
int cx18_queue_move(struct cx18_stream *s, struct cx18_queue *from,
|
static int cx18_queue_move(struct cx18_stream *s, struct cx18_queue *from,
|
||||||
struct cx18_queue *steal, struct cx18_queue *to, int needed_bytes)
|
struct cx18_queue *steal, struct cx18_queue *to,
|
||||||
|
int needed_bytes)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
|
|
@ -39,8 +39,6 @@ static inline void cx18_buf_sync_for_device(struct cx18_stream *s,
|
||||||
s->buf_size, s->dma);
|
s->buf_size, s->dma);
|
||||||
}
|
}
|
||||||
|
|
||||||
int cx18_buf_copy_from_user(struct cx18_stream *s, struct cx18_buffer *buf,
|
|
||||||
const char __user *src, int copybytes);
|
|
||||||
void cx18_buf_swap(struct cx18_buffer *buf);
|
void cx18_buf_swap(struct cx18_buffer *buf);
|
||||||
|
|
||||||
/* cx18_queue utility functions */
|
/* cx18_queue utility functions */
|
||||||
|
@ -48,8 +46,6 @@ void cx18_queue_init(struct cx18_queue *q);
|
||||||
void cx18_enqueue(struct cx18_stream *s, struct cx18_buffer *buf,
|
void cx18_enqueue(struct cx18_stream *s, struct cx18_buffer *buf,
|
||||||
struct cx18_queue *q);
|
struct cx18_queue *q);
|
||||||
struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q);
|
struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q);
|
||||||
int cx18_queue_move(struct cx18_stream *s, struct cx18_queue *from,
|
|
||||||
struct cx18_queue *steal, struct cx18_queue *to, int needed_bytes);
|
|
||||||
struct cx18_buffer *cx18_queue_find_buf(struct cx18_stream *s, u32 id,
|
struct cx18_buffer *cx18_queue_find_buf(struct cx18_stream *s, u32 id,
|
||||||
u32 bytesused);
|
u32 bytesused);
|
||||||
void cx18_flush_queues(struct cx18_stream *s);
|
void cx18_flush_queues(struct cx18_stream *s);
|
||||||
|
|
Loading…
Reference in a new issue