Skip to contentSkip to conversation

stk1160: Remove VIDEO_STK1160_AC97 and SND_AC97_CODEC from Kconfig and Makefile.

PATCH In review Marcel Hasler 2 participants 3 messages Oct 27, 2016

Subsystems (2)
Media (V4L/DVB) STK1160 USB video capture driver
lore
Share & tools
lore

Marcel Hasler

author
#0 lore raw

PATCH 3/3 stk1160: Remove VIDEO_STK1160_AC97 and SND_AC97_CODEC from Kconfig and Makefile.

The VIDEO_STK1160_AC97 option is no longer needed after the removal of stk1160-mixer. For the same reason SND and SND_AC97_CODEC are no longer required.

Signed-off-by Marcel Hasler <[email protected]>
---
 drivers/media/usb/stk1160/Kconfig  | 3 +--
 drivers/media/usb/stk1160/Makefile | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/media/usb/stk1160/Kconfig +1 -2
index 53617da..22dff4f 100644
@@ -10,8 +10,7 @@ config VIDEO_STK1160_COMMON
 
 config VIDEO_STK1160
 	tristate
-	depends on (!VIDEO_STK1160_AC97 || (SND='n') || SND) && VIDEO_STK1160_COMMON
+	depends on VIDEO_STK1160_COMMON
 	default y
 	select VIDEOBUF2_VMALLOC
 	select VIDEO_SAA711X
-	select SND_AC97_CODEC if SND
drivers/media/usb/stk1160/Makefile +1 -3
index dfe3e90..42d0546 100644
@@ -1,10 +1,8 @@
-obj-stk1160-ac97-$(CONFIG_VIDEO_STK1160_AC97) := stk1160-ac97.o
-
 stk1160-y := 	stk1160-core.o \
 		stk1160-v4l.o \
 		stk1160-video.o \
 		stk1160-i2c.o \
-		$(obj-stk1160-ac97-y)
+		stk1160-ac97.o
 
 obj-$(CONFIG_VIDEO_STK1160) += stk1160.o
Signature · 1 line
2.10.1
maintainer
#1 lore raw

Marcel,

Thanks a lot for all your stk1160 fixes. They are much appreciated! In particular,
the click noise was something we really wanted to get rid of:

http://mailman.alsa-project.org/pipermail/alsa-devel/2016-October/113981.html

Regarding the linux-media fixes, is there any chance you re-submit this set of patches, in way that they are properly numbered PATCH 1, PATCH 2, PATCH 3...

git-format-patch is able to do that for you automatically.

You may also include a cover letter (it's optional) to explain what stuff you are fixing, how you tested, where are the patches based, and anything else you want to mention.

(And don't forget to Cc the media mailing list)

Thanks again!
Ezequiel

Quoted 42 lines · Marcel Hasler

The VIDEO_STK1160_AC97 option is no longer needed after the removal of stk1160-mixer. For the same reason SND and SND_AC97_CODEC are no longer required.

Signed-off-by Marcel Hasler <[email protected]>
---
 drivers/media/usb/stk1160/Kconfig  | 3 +--
 drivers/media/usb/stk1160/Makefile | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/media/usb/stk1160/Kconfig +1 -2
index 53617da..22dff4f 100644
@@ -10,8 +10,7 @@ config VIDEO_STK1160_COMMON
 
 config VIDEO_STK1160
        tristate
-       depends on (!VIDEO_STK1160_AC97 || (SND='n') || SND) && VIDEO_STK1160_COMMON
+       depends on VIDEO_STK1160_COMMON
        default y
        select VIDEOBUF2_VMALLOC
        select VIDEO_SAA711X
-       select SND_AC97_CODEC if SND
drivers/media/usb/stk1160/Makefile +1 -4
index dfe3e90..42d0546 100644
@@ -1,10 +1,8 @@
-obj-stk1160-ac97-$(CONFIG_VIDEO_STK1160_AC97) := stk1160-ac97.o
-
 stk1160-y :=   stk1160-core.o \
                stk1160-v4l.o \
                stk1160-video.o \
                stk1160-i2c.o \
-               $(obj-stk1160-ac97-y)
+               stk1160-ac97.o
 
 obj-$(CONFIG_VIDEO_STK1160) += stk1160.o
 
--

2.10.1

Signature · 2 lines
Ezequiel García, VanguardiaSur
www.vanguardiasur.com.ar
author
#2 lore raw

Hi

Sure, I'll clean up the patches later on today and resubmit. The last one should be merged with the first one anyway, I missed that at first.

Regards
Marcel

2016-10-27 14:38 GMT+02:00 Ezequiel Garcia <[email protected]>:

Quoted 64 lines

Marcel,

Thanks a lot for all your stk1160 fixes. They are much appreciated! In particular,
the click noise was something we really wanted to get rid of:

http://mailman.alsa-project.org/pipermail/alsa-devel/2016-October/113981.html

Regarding the linux-media fixes, is there any chance you re-submit this set of patches, in way that they are properly numbered PATCH 1, PATCH 2, PATCH 3...

git-format-patch is able to do that for you automatically.

You may also include a cover letter (it's optional) to explain what stuff you are fixing, how you tested, where are the patches based, and anything else you want to mention.

(And don't forget to Cc the media mailing list)

Thanks again!
Ezequiel

Quoted 39 lines · Marcel Hasler

The VIDEO_STK1160_AC97 option is no longer needed after the removal of stk1160-mixer. For the same reason SND and SND_AC97_CODEC are no longer required.

Signed-off-by Marcel Hasler <[email protected]>
---
 drivers/media/usb/stk1160/Kconfig  | 3 +--
 drivers/media/usb/stk1160/Makefile | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/media/usb/stk1160/Kconfig +1 -2
index 53617da..22dff4f 100644
@@ -10,8 +10,7 @@ config VIDEO_STK1160_COMMON
 
 config VIDEO_STK1160
        tristate
-       depends on (!VIDEO_STK1160_AC97 || (SND='n') || SND) && VIDEO_STK1160_COMMON
+       depends on VIDEO_STK1160_COMMON
        default y
        select VIDEOBUF2_VMALLOC
        select VIDEO_SAA711X
-       select SND_AC97_CODEC if SND
drivers/media/usb/stk1160/Makefile +1 -3
index dfe3e90..42d0546 100644
@@ -1,10 +1,8 @@
-obj-stk1160-ac97-$(CONFIG_VIDEO_STK1160_AC97) := stk1160-ac97.o
-
 stk1160-y :=   stk1160-core.o \
                stk1160-v4l.o \
                stk1160-video.o \
                stk1160-i2c.o \
-               $(obj-stk1160-ac97-y)
+               stk1160-ac97.o
 
 obj-$(CONFIG_VIDEO_STK1160) += stk1160.o
Quoted 9 lines
Quoted 3 lines

--
2.10.1

--
Ezequiel García, VanguardiaSur
www.vanguardiasur.com.ar

2016-10-27 14:38 GMT+02:00 Ezequiel Garcia <[email protected]>:

Quoted 72 lines

Marcel,

Thanks a lot for all your stk1160 fixes. They are much appreciated! In particular,
the click noise was something we really wanted to get rid of:

http://mailman.alsa-project.org/pipermail/alsa-devel/2016-October/113981.html

Regarding the linux-media fixes, is there any chance you re-submit this set of patches, in way that they are properly numbered PATCH 1, PATCH 2, PATCH 3...

git-format-patch is able to do that for you automatically.

You may also include a cover letter (it's optional) to explain what stuff you are fixing, how you tested, where are the patches based, and anything else you want to mention.

(And don't forget to Cc the media mailing list)

Thanks again!
Ezequiel

Quoted 40 lines · Marcel Hasler

The VIDEO_STK1160_AC97 option is no longer needed after the removal of stk1160-mixer. For the same reason SND and SND_AC97_CODEC are no longer required.

Signed-off-by Marcel Hasler <[email protected]>
---
 drivers/media/usb/stk1160/Kconfig  | 3 +--
 drivers/media/usb/stk1160/Makefile | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/media/usb/stk1160/Kconfig +1 -2
index 53617da..22dff4f 100644
@@ -10,8 +10,7 @@ config VIDEO_STK1160_COMMON
 
 config VIDEO_STK1160
        tristate
-       depends on (!VIDEO_STK1160_AC97 || (SND='n') || SND) && VIDEO_STK1160_COMMON
+       depends on VIDEO_STK1160_COMMON
        default y
        select VIDEOBUF2_VMALLOC
        select VIDEO_SAA711X
-       select SND_AC97_CODEC if SND
drivers/media/usb/stk1160/Makefile +1 -4
index dfe3e90..42d0546 100644
@@ -1,10 +1,8 @@
-obj-stk1160-ac97-$(CONFIG_VIDEO_STK1160_AC97) := stk1160-ac97.o
-
 stk1160-y :=   stk1160-core.o \
                stk1160-v4l.o \
                stk1160-video.o \
                stk1160-i2c.o \
-               $(obj-stk1160-ac97-y)
+               stk1160-ac97.o
 
 obj-$(CONFIG_VIDEO_STK1160) += stk1160.o
 
--
Quoted 2 lines

2.10.1

--
Ezequiel García, VanguardiaSur
www.vanguardiasur.com.ar