Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 192752
b: refs/heads/master
c: 278a58c
h: refs/heads/master
v: v3
  • Loading branch information
Márton Németh authored and Mauro Carvalho Chehab committed May 18, 2010
1 parent 277ddb6 commit b7e68af
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7b1fc72c2fdeb91565f4969397757ee938cce67e
refs/heads/master: 278a58cf2ab6e690fa79ca7e0d466a0cb453296f
6 changes: 3 additions & 3 deletions trunk/drivers/media/video/tlg2300/pd-main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ int debug_mode;
module_param(debug_mode, int, 0644);
MODULE_PARM_DESC(debug_mode, "0 = disable, 1 = enable, 2 = verbose");

const char *firmware_name = "tlg2300_firmware.bin";
struct usb_driver poseidon_driver;
static const char *firmware_name = "tlg2300_firmware.bin";
static struct usb_driver poseidon_driver;
static LIST_HEAD(pd_device_list);

/*
Expand Down Expand Up @@ -501,7 +501,7 @@ static void poseidon_disconnect(struct usb_interface *interface)
kref_put(&pd->kref, poseidon_delete);
}

struct usb_driver poseidon_driver = {
static struct usb_driver poseidon_driver = {
.name = "poseidon",
.probe = poseidon_probe,
.disconnect = poseidon_disconnect,
Expand Down
21 changes: 12 additions & 9 deletions trunk/drivers/media/video/tlg2300/pd-radio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ static const struct v4l2_file_operations poseidon_fm_fops = {
.ioctl = video_ioctl2,
};

int tlg_fm_vidioc_g_tuner(struct file *file, void *priv, struct v4l2_tuner *vt)
static int tlg_fm_vidioc_g_tuner(struct file *file, void *priv,
struct v4l2_tuner *vt)
{
struct tuner_fm_sig_stat_s fm_stat = {};
int ret, status, count = 5;
Expand Down Expand Up @@ -203,7 +204,8 @@ int tlg_fm_vidioc_g_tuner(struct file *file, void *priv, struct v4l2_tuner *vt)
return 0;
}

int fm_get_freq(struct file *file, void *priv, struct v4l2_frequency *argp)
static int fm_get_freq(struct file *file, void *priv,
struct v4l2_frequency *argp)
{
struct poseidon *p = file->private_data;

Expand Down Expand Up @@ -246,7 +248,8 @@ static int set_frequency(struct poseidon *p, __u32 frequency)
return ret;
}

int fm_set_freq(struct file *file, void *priv, struct v4l2_frequency *argp)
static int fm_set_freq(struct file *file, void *priv,
struct v4l2_frequency *argp)
{
struct poseidon *p = file->private_data;

Expand All @@ -258,13 +261,13 @@ int fm_set_freq(struct file *file, void *priv, struct v4l2_frequency *argp)
return set_frequency(p, argp->frequency);
}

int tlg_fm_vidioc_g_ctrl(struct file *file, void *priv,
static int tlg_fm_vidioc_g_ctrl(struct file *file, void *priv,
struct v4l2_control *arg)
{
return 0;
}

int tlg_fm_vidioc_g_exts_ctrl(struct file *file, void *fh,
static int tlg_fm_vidioc_g_exts_ctrl(struct file *file, void *fh,
struct v4l2_ext_controls *ctrls)
{
struct poseidon *p = file->private_data;
Expand All @@ -285,7 +288,7 @@ int tlg_fm_vidioc_g_exts_ctrl(struct file *file, void *fh,
return 0;
}

int tlg_fm_vidioc_s_exts_ctrl(struct file *file, void *fh,
static int tlg_fm_vidioc_s_exts_ctrl(struct file *file, void *fh,
struct v4l2_ext_controls *ctrls)
{
int i;
Expand All @@ -312,13 +315,13 @@ int tlg_fm_vidioc_s_exts_ctrl(struct file *file, void *fh,
return 0;
}

int tlg_fm_vidioc_s_ctrl(struct file *file, void *priv,
static int tlg_fm_vidioc_s_ctrl(struct file *file, void *priv,
struct v4l2_control *ctrl)
{
return 0;
}

int tlg_fm_vidioc_queryctrl(struct file *file, void *priv,
static int tlg_fm_vidioc_queryctrl(struct file *file, void *priv,
struct v4l2_queryctrl *ctrl)
{
if (!(ctrl->id & V4L2_CTRL_FLAG_NEXT_CTRL))
Expand All @@ -337,7 +340,7 @@ int tlg_fm_vidioc_queryctrl(struct file *file, void *priv,
return -EINVAL;
}

int tlg_fm_vidioc_querymenu(struct file *file, void *fh,
static int tlg_fm_vidioc_querymenu(struct file *file, void *fh,
struct v4l2_querymenu *qmenu)
{
return v4l2_ctrl_query_menu(qmenu, NULL, NULL);
Expand Down
16 changes: 8 additions & 8 deletions trunk/drivers/media/video/tlg2300/pd-video.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ static int pm_video_resume(struct poseidon *pd);
#endif
static void iso_bubble_handler(struct work_struct *w);

int usb_transfer_mode;
static int usb_transfer_mode;
module_param(usb_transfer_mode, int, 0644);
MODULE_PARM_DESC(usb_transfer_mode, "0 = Bulk, 1 = Isochronous");

Expand Down Expand Up @@ -619,7 +619,7 @@ static int pd_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
return 0;
}

int fire_all_urb(struct video_data *video)
static int fire_all_urb(struct video_data *video)
{
int i, ret;

Expand Down Expand Up @@ -879,7 +879,7 @@ static int set_std(struct poseidon *pd, v4l2_std_id *norm)
return ret;
}

int vidioc_s_std(struct file *file, void *fh, v4l2_std_id *norm)
static int vidioc_s_std(struct file *file, void *fh, v4l2_std_id *norm)
{
struct front_face *front = fh;
logs(front);
Expand Down Expand Up @@ -1022,7 +1022,7 @@ static int vidioc_enumaudio(struct file *file, void *fh, struct v4l2_audio *a)
return 0;
}

int vidioc_g_audio(struct file *file, void *fh, struct v4l2_audio *a)
static int vidioc_g_audio(struct file *file, void *fh, struct v4l2_audio *a)
{
a->index = 0;
a->capability = V4L2_AUDCAP_STEREO;
Expand All @@ -1031,7 +1031,7 @@ int vidioc_g_audio(struct file *file, void *fh, struct v4l2_audio *a)
return 0;
}

int vidioc_s_audio(struct file *file, void *fh, struct v4l2_audio *a)
static int vidioc_s_audio(struct file *file, void *fh, struct v4l2_audio *a)
{
return (0 == a->index) ? 0 : -EINVAL;
}
Expand Down Expand Up @@ -1191,7 +1191,7 @@ static int vidioc_dqbuf(struct file *file, void *fh, struct v4l2_buffer *b)
}

/* Just stop the URBs, do not free the URBs */
int usb_transfer_stop(struct video_data *video)
static int usb_transfer_stop(struct video_data *video)
{
if (video->is_streaming) {
int i;
Expand Down Expand Up @@ -1520,13 +1520,13 @@ static int pd_video_mmap(struct file *file, struct vm_area_struct *vma)
return videobuf_mmap_mapper(&front->q, vma);
}

unsigned int pd_video_poll(struct file *file, poll_table *table)
static unsigned int pd_video_poll(struct file *file, poll_table *table)
{
struct front_face *front = file->private_data;
return videobuf_poll_stream(file, &front->q, table);
}

ssize_t pd_video_read(struct file *file, char __user *buffer,
static ssize_t pd_video_read(struct file *file, char __user *buffer,
size_t count, loff_t *ppos)
{
struct front_face *front = file->private_data;
Expand Down

0 comments on commit b7e68af

Please sign in to comment.