Commit ff35213f authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-core: Module re-organization 



videodev.ko and v4l2-common.ko driver are built under
the same conditions. Therefore, it doesn't make much sense
to split them in two different modules.

Splitting v4l2-common to its own driver was done many years ago:

  commit a9254475
  Author: Mauro Carvalho Chehab <mchehab@infradead.org>
  Date:   Tue Jan 29 18:32:35 2008 -0300

      V4L/DVB (7115): Fix bug #9833: regression when compiling V4L without I2C

Back then, the subsystem organization was different and the module split
was needed. However, with the current organization, there is no issue
compiling V4L2 with I2C as y/m/n.

This commit makes v4l2-common part of our V4L2 core driver (videodev.ko).

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 9ca6f512

drivers/media/v4l2-core/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -7,14 +7,13 @@ tuner-objs := tuner-core.o 


videodev-objs	:=	v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \

			v4l2-event.o v4l2-ctrls.o v4l2-subdev.o v4l2-clk.o \

			v4l2-async.o

			v4l2-async.o v4l2-common.o

videodev-$(CONFIG_COMPAT) += v4l2-compat-ioctl32.o

videodev-$(CONFIG_TRACEPOINTS) += v4l2-trace.o

videodev-$(CONFIG_MEDIA_CONTROLLER) += v4l2-mc.o



obj-$(CONFIG_V4L2_FWNODE) += v4l2-fwnode.o

obj-$(CONFIG_VIDEO_V4L2) += videodev.o

obj-$(CONFIG_VIDEO_V4L2) += v4l2-common.o

obj-$(CONFIG_VIDEO_V4L2) += v4l2-dv-timings.o



obj-$(CONFIG_VIDEO_TUNER) += tuner.o

drivers/media/v4l2-core/v4l2-common.c

+0 −4
Original line number Diff line number Diff line
@@ -54,10 +54,6 @@ 


#include <linux/videodev2.h>



MODULE_AUTHOR("Bill Dirks, Justin Schoeman, Gerd Knorr");

MODULE_DESCRIPTION("misc helper functions for v4l2 device drivers");

MODULE_LICENSE("GPL");



/*

 *

 *	V 4 L 2   D R I V E R   H E L P E R   A P I

drivers/media/v4l2-core/v4l2-dev.c

+2 −2
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ static void __exit videodev_exit(void) 
subsys_initcall(videodev_init);

module_exit(videodev_exit)



MODULE_AUTHOR("Alan Cox, Mauro Carvalho Chehab <mchehab@kernel.org>");

MODULE_DESCRIPTION("Device registrar for Video4Linux drivers v2");

MODULE_AUTHOR("Alan Cox, Mauro Carvalho Chehab <mchehab@kernel.org>, Bill Dirks, Justin Schoeman, Gerd Knorr");

MODULE_DESCRIPTION("Video4Linux2 core driver");

MODULE_LICENSE("GPL");

MODULE_ALIAS_CHARDEV_MAJOR(VIDEO_MAJOR);

CRA Git | Maintained and supported by SUSTech CRA and CCSE