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

Commit 7087d31b authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] cx25821: drop cx25821-video-upstream-ch2.c/h 



cx25821-video-upstream_ch2.c/h is practically identical to cx25821-video-upstream.c/h
so add support for ch2 into cx25821-video-upstream.c instead.
After this we can replace the custom ioctls with a proper write() interface.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e90878ab

drivers/media/pci/cx25821/Makefile

+0 −1
Original line number Diff line number Diff line 
cx25821-y   := cx25821-core.o cx25821-cards.o cx25821-i2c.o \

		       cx25821-gpio.o cx25821-medusa-video.o \

		       cx25821-video.o cx25821-video-upstream.o \

		       cx25821-video-upstream-ch2.o \

		       cx25821-audio-upstream.o



obj-$(CONFIG_VIDEO_CX25821) += cx25821.o

drivers/media/pci/cx25821/cx25821-core.c

+2 −2
Original line number Diff line number Diff line
@@ -963,8 +963,6 @@ void cx25821_dev_unregister(struct cx25821_dev *dev) 
	if (!dev->base_io_addr)

		return;



	cx25821_free_mem_upstream_ch1(dev);

	cx25821_free_mem_upstream_ch2(dev);

	cx25821_free_mem_upstream_audio(dev);



	release_mem_region(dev->base_io_addr, pci_resource_len(dev->pci, 0));
@@ -972,6 +970,8 @@ void cx25821_dev_unregister(struct cx25821_dev *dev) 
	for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; i++) {

		if (i == SRAM_CH08) /* audio channel */

			continue;

		if (i == SRAM_CH09 || i == SRAM_CH10)

			cx25821_free_mem_upstream(&dev->channels[i]);

		cx25821_video_unregister(dev, i);

	}

drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c

deleted100644 → 0
+0 −800

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/media/pci/cx25821/cx25821-video-upstream-ch2.h

deleted100644 → 0
+0 −138

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/media/pci/cx25821/cx25821-video-upstream.c

+175 −174

File changed.

Preview size limit exceeded, changes collapsed.