diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-07 05:02:27 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:41 -0400 |
commit | 8ac05ae3192ce8a71fc84e4a88772cce0c09173c (patch) | |
tree | 997f2d8bbedf857b33bf62d44b9cc4cd8c7a9f73 /drivers/media/video/ivtv/ivtv-driver.h | |
parent | d7493e518fa98d2c30c545c518df075903bae513 (diff) |
V4L/DVB (10488): ivtv: cleanup naming conventions
Use consistent naming for pci_dev, v4l2_device and video_device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.h')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index 94f7f44d598..440f7328a7e 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h | |||
@@ -133,7 +133,7 @@ extern int ivtv_debug; | |||
133 | #define IVTV_DEBUG(x, type, fmt, args...) \ | 133 | #define IVTV_DEBUG(x, type, fmt, args...) \ |
134 | do { \ | 134 | do { \ |
135 | if ((x) & ivtv_debug) \ | 135 | if ((x) & ivtv_debug) \ |
136 | v4l2_info(&itv->device, " " type ": " fmt , ##args); \ | 136 | v4l2_info(&itv->v4l2_dev, " " type ": " fmt , ##args); \ |
137 | } while (0) | 137 | } while (0) |
138 | #define IVTV_DEBUG_WARN(fmt, args...) IVTV_DEBUG(IVTV_DBGFLG_WARN, "warn", fmt , ## args) | 138 | #define IVTV_DEBUG_WARN(fmt, args...) IVTV_DEBUG(IVTV_DBGFLG_WARN, "warn", fmt , ## args) |
139 | #define IVTV_DEBUG_INFO(fmt, args...) IVTV_DEBUG(IVTV_DBGFLG_INFO, "info", fmt , ## args) | 139 | #define IVTV_DEBUG_INFO(fmt, args...) IVTV_DEBUG(IVTV_DBGFLG_INFO, "info", fmt , ## args) |
@@ -149,7 +149,7 @@ extern int ivtv_debug; | |||
149 | #define IVTV_DEBUG_HIGH_VOL(x, type, fmt, args...) \ | 149 | #define IVTV_DEBUG_HIGH_VOL(x, type, fmt, args...) \ |
150 | do { \ | 150 | do { \ |
151 | if (((x) & ivtv_debug) && (ivtv_debug & IVTV_DBGFLG_HIGHVOL)) \ | 151 | if (((x) & ivtv_debug) && (ivtv_debug & IVTV_DBGFLG_HIGHVOL)) \ |
152 | v4l2_info(&itv->device, " " type ": " fmt , ##args); \ | 152 | v4l2_info(&itv->v4l2_dev, " " type ": " fmt , ##args); \ |
153 | } while (0) | 153 | } while (0) |
154 | #define IVTV_DEBUG_HI_WARN(fmt, args...) IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_WARN, "warn", fmt , ## args) | 154 | #define IVTV_DEBUG_HI_WARN(fmt, args...) IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_WARN, "warn", fmt , ## args) |
155 | #define IVTV_DEBUG_HI_INFO(fmt, args...) IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_INFO, "info", fmt , ## args) | 155 | #define IVTV_DEBUG_HI_INFO(fmt, args...) IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_INFO, "info", fmt , ## args) |
@@ -163,9 +163,9 @@ extern int ivtv_debug; | |||
163 | #define IVTV_DEBUG_HI_YUV(fmt, args...) IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_YUV, "yuv", fmt , ## args) | 163 | #define IVTV_DEBUG_HI_YUV(fmt, args...) IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_YUV, "yuv", fmt , ## args) |
164 | 164 | ||
165 | /* Standard kernel messages */ | 165 | /* Standard kernel messages */ |
166 | #define IVTV_ERR(fmt, args...) v4l2_err(&itv->device, fmt , ## args) | 166 | #define IVTV_ERR(fmt, args...) v4l2_err(&itv->v4l2_dev, fmt , ## args) |
167 | #define IVTV_WARN(fmt, args...) v4l2_warn(&itv->device, fmt , ## args) | 167 | #define IVTV_WARN(fmt, args...) v4l2_warn(&itv->v4l2_dev, fmt , ## args) |
168 | #define IVTV_INFO(fmt, args...) v4l2_info(&itv->device, fmt , ## args) | 168 | #define IVTV_INFO(fmt, args...) v4l2_info(&itv->v4l2_dev, fmt , ## args) |
169 | 169 | ||
170 | /* output modes (cx23415 only) */ | 170 | /* output modes (cx23415 only) */ |
171 | #define OUT_NONE 0 | 171 | #define OUT_NONE 0 |
@@ -315,7 +315,7 @@ struct ivtv; /* forward reference */ | |||
315 | struct ivtv_stream { | 315 | struct ivtv_stream { |
316 | /* These first four fields are always set, even if the stream | 316 | /* These first four fields are always set, even if the stream |
317 | is not actually created. */ | 317 | is not actually created. */ |
318 | struct video_device *v4l2dev; /* NULL when stream not created */ | 318 | struct video_device *vdev; /* NULL when stream not created */ |
319 | struct ivtv *itv; /* for ease of use */ | 319 | struct ivtv *itv; /* for ease of use */ |
320 | const char *name; /* name of the stream */ | 320 | const char *name; /* name of the stream */ |
321 | int type; /* stream type */ | 321 | int type; /* stream type */ |
@@ -592,7 +592,7 @@ struct ivtv_card; | |||
592 | /* Struct to hold info about ivtv cards */ | 592 | /* Struct to hold info about ivtv cards */ |
593 | struct ivtv { | 593 | struct ivtv { |
594 | /* General fixed card data */ | 594 | /* General fixed card data */ |
595 | struct pci_dev *dev; /* PCI device */ | 595 | struct pci_dev *pdev; /* PCI device */ |
596 | const struct ivtv_card *card; /* card information */ | 596 | const struct ivtv_card *card; /* card information */ |
597 | const char *card_name; /* full name of the card */ | 597 | const char *card_name; /* full name of the card */ |
598 | const struct ivtv_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */ | 598 | const struct ivtv_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */ |
@@ -612,7 +612,7 @@ struct ivtv { | |||
612 | volatile void __iomem *reg_mem; /* pointer to mapped registers */ | 612 | volatile void __iomem *reg_mem; /* pointer to mapped registers */ |
613 | struct ivtv_options options; /* user options */ | 613 | struct ivtv_options options; /* user options */ |
614 | 614 | ||
615 | struct v4l2_device device; | 615 | struct v4l2_device v4l2_dev; |
616 | struct v4l2_subdev sd_gpio; /* GPIO sub-device */ | 616 | struct v4l2_subdev sd_gpio; /* GPIO sub-device */ |
617 | u16 instance; | 617 | u16 instance; |
618 | 618 | ||
@@ -719,9 +719,9 @@ struct ivtv { | |||
719 | struct osd_info *osd_info; /* ivtvfb private OSD info */ | 719 | struct osd_info *osd_info; /* ivtvfb private OSD info */ |
720 | }; | 720 | }; |
721 | 721 | ||
722 | static inline struct ivtv *to_ivtv(struct v4l2_device *dev) | 722 | static inline struct ivtv *to_ivtv(struct v4l2_device *v4l2_dev) |
723 | { | 723 | { |
724 | return container_of(dev, struct ivtv, device); | 724 | return container_of(v4l2_dev, struct ivtv, v4l2_dev); |
725 | } | 725 | } |
726 | 726 | ||
727 | /* Globals */ | 727 | /* Globals */ |
@@ -788,7 +788,7 @@ static inline int ivtv_raw_vbi(const struct ivtv *itv) | |||
788 | /* Call the specified callback for all subdevs matching hw (if 0, then | 788 | /* Call the specified callback for all subdevs matching hw (if 0, then |
789 | match them all). Ignore any errors. */ | 789 | match them all). Ignore any errors. */ |
790 | #define ivtv_call_hw(itv, hw, o, f, args...) \ | 790 | #define ivtv_call_hw(itv, hw, o, f, args...) \ |
791 | __v4l2_device_call_subdevs(&(itv)->device, !(hw) || (sd->grp_id & (hw)), o, f , ##args) | 791 | __v4l2_device_call_subdevs(&(itv)->v4l2_dev, !(hw) || (sd->grp_id & (hw)), o, f , ##args) |
792 | 792 | ||
793 | #define ivtv_call_all(itv, o, f, args...) ivtv_call_hw(itv, 0, o, f , ##args) | 793 | #define ivtv_call_all(itv, o, f, args...) ivtv_call_hw(itv, 0, o, f , ##args) |
794 | 794 | ||
@@ -796,7 +796,7 @@ static inline int ivtv_raw_vbi(const struct ivtv *itv) | |||
796 | match them all). If the callback returns an error other than 0 or | 796 | match them all). If the callback returns an error other than 0 or |
797 | -ENOIOCTLCMD, then return with that error code. */ | 797 | -ENOIOCTLCMD, then return with that error code. */ |
798 | #define ivtv_call_hw_err(itv, hw, o, f, args...) \ | 798 | #define ivtv_call_hw_err(itv, hw, o, f, args...) \ |
799 | __v4l2_device_call_subdevs_until_err(&(itv)->device, !(hw) || (sd->grp_id & (hw)), o, f , ##args) | 799 | __v4l2_device_call_subdevs_until_err(&(itv)->v4l2_dev, !(hw) || (sd->grp_id & (hw)), o, f , ##args) |
800 | 800 | ||
801 | #define ivtv_call_all_err(itv, o, f, args...) ivtv_call_hw_err(itv, 0, o, f , ##args) | 801 | #define ivtv_call_all_err(itv, o, f, args...) ivtv_call_hw_err(itv, 0, o, f , ##args) |
802 | 802 | ||