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

Commit 6e4f574b authored by Sri Deevi's avatar Sri Deevi Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10958): cx231xx: some additional CodingStyle and minor fixes 



changed the pcb-config.c/h to pcb-cfg.c/h for short names.

Signed-off-by: default avatarSrinivasa Deevi <srinivasa.deevi@conexant.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b9255176

drivers/media/video/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -807,6 +807,8 @@ source "drivers/media/video/hdpvr/Kconfig" 


source "drivers/media/video/em28xx/Kconfig"



source "drivers/media/video/cx231xx/Kconfig"



source "drivers/media/video/usbvision/Kconfig"



source "drivers/media/video/usbvideo/Kconfig"

drivers/media/video/cx231xx/Kconfig

+25 −25
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ config VIDEO_CX231XX_DVB 
       tristate "DVB/ATSC Support for Cx231xx based TV cards"

       depends on VIDEO_CX231XX && DVB_CORE

       select VIDEOBUF_DVB

	select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE

       select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE

       ---help---

	 This adds support for DVB cards based on the

	 Conexant cx231xx chips.

drivers/media/video/cx231xx/Makefile

+2 −5
Original line number Diff line number Diff line 
cx231xx-objs     := cx231xx-video.o cx231xx-i2c.o cx231xx-cards.o cx231xx-core.o \

                    cx231xx-avcore.o cx231xx-pcb-config.o cx231xx-vbi.o



cx231xx-alsa-objs := cx231xx-audio.o



		    cx231xx-avcore.o cx231xx-pcb-cfg.o cx231xx-vbi.o



obj-$(CONFIG_VIDEO_CX231XX) += cx231xx.o

obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-alsa.o

obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-audio.o

obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o



EXTRA_CFLAGS += -Idrivers/media/video

drivers/media/video/cx231xx/cx231xx-audio.c

+7 −7
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <sound/control.h>

#include <media/v4l2-common.h>

#include "cx231xx.h"

#include "cx231xx-pcb-config.h"



static int debug;

module_param(debug, int, 0644);
@@ -264,7 +263,8 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, 
static struct snd_pcm_hardware snd_cx231xx_hw_capture = {

	.info = SNDRV_PCM_INFO_BLOCK_TRANSFER 	|

	    SNDRV_PCM_INFO_MMAP 		|

	    SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP_VALID,

	    SNDRV_PCM_INFO_INTERLEAVED 		|

	    SNDRV_PCM_INFO_MMAP_VALID,



	.formats = SNDRV_PCM_FMTBIT_S16_LE,

drivers/media/video/cx231xx/cx231xx-avcore.c

+153 −152

File changed.

Preview size limit exceeded, changes collapsed.