V4L/DVB (10280): cx18: Rename structure members: dev to pci_dev and v4l2dev to video_dev

Renamed structure member name to be more specific to type in anticipation
of updating to the v4l2_device/v4l2_subdev framework.  Too many objects named
"dev" and /v4l2_\{0,1\}dev/ would be to confusing.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 36809dd3d848..316ff333d4a5 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -279,7 +279,7 @@ struct cx18_epu_work_order {
 struct cx18_stream {
         /* These first four fields are always set, even if the stream
            is not actually created. */
-        struct video_device *v4l2dev;   /* NULL when stream not created */
+        struct video_device *video_dev; /* NULL when stream not created */
         struct cx18 *cx;                /* for ease of use */
         const char *name;               /* name of the stream */
         int type;                       /* stream type */
@@ -385,7 +385,7 @@ struct cx18_i2c_algo_callback_data {
 struct cx18 {
         int num;                /* board number, -1 during init! */
         char name[8];           /* board name for printk and interrupts (e.g. 'cx180') */
-        struct pci_dev *dev;    /* PCI device */
+        struct pci_dev *pci_dev;
         const struct cx18_card *card;   /* card information */
         const char *card_name;  /* full name of the card */
         const struct cx18_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */