diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-07 11:02:27 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-07 11:02:27 +0100 |
| commit | 721dc4a20bd1636daf1304885f235c8844e2cdda (patch) | |
| tree | ca96420cb1facf4f421ea8cf607915c8ae578b5a /linux/drivers/media/video/ivtv/ivtvfb.c | |
| parent | c56f7694e4d231f52e5dd570abf003863813a3c6 (diff) | |
| download | mediapointer-dvb-s2-721dc4a20bd1636daf1304885f235c8844e2cdda.tar.gz mediapointer-dvb-s2-721dc4a20bd1636daf1304885f235c8844e2cdda.tar.bz2 | |
ivtv: cleanup naming conventions
From: Hans Verkuil <hverkuil@xs4all.nl>
Use consistent naming for pci_dev, v4l2_device and video_device.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtvfb.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtvfb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtvfb.c b/linux/drivers/media/video/ivtv/ivtvfb.c index 26b91d2c8..a48fe216b 100644 --- a/linux/drivers/media/video/ivtv/ivtvfb.c +++ b/linux/drivers/media/video/ivtv/ivtvfb.c @@ -1201,12 +1201,12 @@ static int ivtvfb_init_card(struct ivtv *itv) static int __init ivtvfb_callback_init(struct device *dev, void *p) { struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); - struct ivtv *itv = container_of(v4l2_dev, struct ivtv, device); + struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev); if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) { if (ivtvfb_init_card(itv) == 0) { IVTVFB_INFO("Framebuffer registered on %s\n", - itv->device.name); + itv->v4l2_dev.name); (*(int *)p)++; } } @@ -1216,7 +1216,7 @@ static int __init ivtvfb_callback_init(struct device *dev, void *p) static int ivtvfb_callback_cleanup(struct device *dev, void *p) { struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); - struct ivtv *itv = container_of(v4l2_dev, struct ivtv, device); + struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev); if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) { if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) { |