From: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Date: Fri, 26 Oct 2007 20:15:19 +0000 (-0300)
Subject: V4L/DVB (6414): Remove bass, treble and balance from audio hook since they are unused
X-Git-Tag: v2.6.25-rc1~1235^2~496
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de5bec6bb57e88db7efa49c6f7de0794ae67d06a;p=linux-2.6

V4L/DVB (6414): Remove bass, treble and balance from audio hook since they are unused

Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 2cdbac3020..28b3a3efb8 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1454,15 +1454,6 @@ static int get_control(struct bttv *btv, struct v4l2_control *c)
 		case V4L2_CID_AUDIO_VOLUME:
 			c->value = va.volume;
 			break;
-		case V4L2_CID_AUDIO_BALANCE:
-			c->value = va.balance;
-			break;
-		case V4L2_CID_AUDIO_BASS:
-			c->value = va.bass;
-			break;
-		case V4L2_CID_AUDIO_TREBLE:
-			c->value = va.treble;
-			break;
 		}
 		return 0;
 	}
@@ -1557,15 +1548,6 @@ static int set_control(struct bttv *btv, struct v4l2_control *c)
 		case V4L2_CID_AUDIO_VOLUME:
 			va.volume = c->value;
 			break;
-		case V4L2_CID_AUDIO_BALANCE:
-			va.balance = c->value;
-			break;
-		case V4L2_CID_AUDIO_BASS:
-			va.bass = c->value;
-			break;
-		case V4L2_CID_AUDIO_TREBLE:
-			va.treble = c->value;
-			break;
 		}
 		btv->audio_hook(btv,&va,1);
 		return 0;
@@ -2899,18 +2881,6 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
 				if (!(va.flags & VIDEO_AUDIO_VOLUME))
 					*c = no_ctl;
 				break;
-			case V4L2_CID_AUDIO_BALANCE:
-				if (!(va.flags & VIDEO_AUDIO_BALANCE))
-					*c = no_ctl;
-				break;
-			case V4L2_CID_AUDIO_BASS:
-				if (!(va.flags & VIDEO_AUDIO_BASS))
-					*c = no_ctl;
-				break;
-			case V4L2_CID_AUDIO_TREBLE:
-				if (!(va.flags & VIDEO_AUDIO_TREBLE))
-					*c = no_ctl;
-				break;
 			}
 		}
 #endif