Skip to contentSkip to conversation

media: ivtv: remove ivtv-alsa-mixer

PATCH New Corentin Labbe 1 participant 1 message Feb 8, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: ivtv: remove ivtv-alsa-mixer

ivtv-alsa-mixer functions was introduced in commit 269c11fbac4f ("[media] ivtv, ivtv-alsa: Add initial ivtv-alsa interface driver for ivtv") But according to commit message, ivtv-alsa-mixer.c was already dead
code.
5 years after, we should remove it.

---
 drivers/media/pci/ivtv/ivtv-alsa-main.c  |  10 +-
 drivers/media/pci/ivtv/ivtv-alsa-mixer.c | 165 -------------------------------
 drivers/media/pci/ivtv/ivtv-alsa-mixer.h |  18 ----
 3 files changed, 1 insertion(+), 192 deletions(-)
 delete mode 100644 drivers/media/pci/ivtv/ivtv-alsa-mixer.c
 delete mode 100644 drivers/media/pci/ivtv/ivtv-alsa-mixer.h
drivers/media/pci/ivtv/ivtv-alsa-main.c +1 -9
index 029f52733f70..cb74aeb3035c 100644
@@ -160,15 +160,7 @@ static int snd_ivtv_init(struct v4l2_device *v4l2_dev)
 	/* (4) Set the driver ID and name strings */
 	snd_ivtv_card_set_names(itvsc);
 
-	/* (5) Create other components: mixer, PCM, & proc files */
-#if 0
-	ret = snd_ivtv_mixer_create(itvsc);
-	if (ret) {
-		IVTV_ALSA_WARN("%s: snd_ivtv_mixer_create() failed with err %d: proceeding anyway\n",
-			       __func__, ret);
-	}
-#endif
-
+	/* (5) Create other components: PCM, & proc files */
 	ret = snd_ivtv_pcm_create(itvsc);
 	if (ret) {
 		IVTV_ALSA_ERR("%s: snd_ivtv_pcm_create() failed with err %d\n",
drivers/media/pci/ivtv/ivtv-alsa-mixer.c deleted +0 -165

165 lines not on this page · raw message

drivers/media/pci/ivtv/ivtv-alsa-mixer.h deleted +0 -18
deleted file mode 100644
index 382bc36bc529..000000000000
@@ -1,18 +0,0 @@
-/*
- *  ALSA mixer controls for the
- *  ALSA interface to ivtv PCM capture streams
- *
- *  Copyright (C) 2009,2012  Andy Walls <[email protected]>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- */
-
-int __init snd_ivtv_mixer_create(struct snd_ivtv_card *itvsc);
Signature · 1 line
2.13.6