Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de5bec6b authored by Nickolay's avatar Nickolay Committed by Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarNickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 5b261016

drivers/media/video/bt8xx/bttv-driver.c

+0 −30
Original line number Diff line number Diff line
@@ -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