[media] cx23885: fix UNSET/TUNER_ABSENT confusion

Sometimes dev->tuner_type is compared to UNSET, sometimes to TUNER_ABSENT,
but these defines have different values.

Standardize to TUNER_ABSENT.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c
index 95666eee7b277026f3c1154a78361212653130b9..bf89fc88692eb1ac081b34fc24691737e08c3951 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-417.c
+++ b/drivers/media/pci/cx23885/cx23885-417.c
@@ -1266,7 +1266,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
        struct cx23885_fh  *fh  = file->private_data;
        struct cx23885_dev *dev = fh->dev;
 
-       if (UNSET == dev->tuner_type)
+       if (dev->tuner_type == TUNER_ABSENT)
                return -EINVAL;
        if (0 != t->index)
                return -EINVAL;
@@ -1284,7 +1284,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
        struct cx23885_fh  *fh  = file->private_data;
        struct cx23885_dev *dev = fh->dev;
 
-       if (UNSET == dev->tuner_type)
+       if (dev->tuner_type == TUNER_ABSENT)
                return -EINVAL;
 
        /* Update the A/V core */
@@ -1299,7 +1299,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
        struct cx23885_fh  *fh  = file->private_data;
        struct cx23885_dev *dev = fh->dev;
 
-       if (UNSET == dev->tuner_type)
+       if (dev->tuner_type == TUNER_ABSENT)
                return -EINVAL;
        f->type = V4L2_TUNER_ANALOG_TV;
        f->frequency = dev->freq;
@@ -1347,7 +1347,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
                V4L2_CAP_READWRITE     |
                V4L2_CAP_STREAMING     |
                0;
-       if (UNSET != dev->tuner_type)
+       if (dev->tuner_type != TUNER_ABSENT)
                cap->capabilities |= V4L2_CAP_TUNER;
 
        return 0;

diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
index 71e3ec3d8a3d10ded66b9200be691b5c3c344916..91e4cb457296ccdef2b1b777e6f8594341a71a1d 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-video.c
+++ b/drivers/media/pci/cx23885/cx23885-video.c
@@ -1157,7 +1157,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
                V4L2_CAP_READWRITE     |
                V4L2_CAP_STREAMING     |
                V4L2_CAP_VBI_CAPTURE;
-       if (UNSET != dev->tuner_type)
+       if (dev->tuner_type != TUNER_ABSENT)
                cap->capabilities |= V4L2_CAP_TUNER;
        return 0;
 }
@@ -1475,7 +1475,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
 {
        struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
 
-       if (unlikely(UNSET == dev->tuner_type))
+       if (dev->tuner_type == TUNER_ABSENT)
                return -EINVAL;
        if (0 != t->index)
                return -EINVAL;
@@ -1491,7 +1491,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 {
        struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
 
-       if (UNSET == dev->tuner_type)
+       if (dev->tuner_type == TUNER_ABSENT)
                return -EINVAL;
        if (0 != t->index)
                return -EINVAL;
@@ -1507,7 +1507,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
        struct cx23885_fh *fh = priv;
        struct cx23885_dev *dev = fh->dev;
 
-       if (unlikely(UNSET == dev->tuner_type))
+       if (dev->tuner_type == TUNER_ABSENT)
                return -EINVAL;
 
        /* f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; */
@@ -1523,7 +1523,7 @@ static int cx23885_set_freq(struct cx23885_dev *dev, const struct v4l2_frequency
 {
        struct v4l2_control ctrl;
 
-       if (unlikely(UNSET == dev->tuner_type))
+       if (dev->tuner_type == TUNER_ABSENT)
                return -EINVAL;
        if (unlikely(f->tuner != 0))
                return -EINVAL;