Em Wed, 31 Oct 2018 11:00:22 +0100 Hans Verkuil <hverkuil@xxxxxxxxx> escreveu: > On 10/31/2018 10:40 AM, Mauro Carvalho Chehab wrote: > > Em Wed, 31 Oct 2018 11:29:45 +0200 > > Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> escreveu: > > > >> Hi Mauro, > >> > >> On Tue, Oct 30, 2018 at 09:06:18AM -0300, Mauro Carvalho Chehab wrote: > >>> Em Tue, 30 Oct 2018 01:00:29 +0200 > >>> Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> escreveu: > >>> > >>>> Clean up the SoC camera framework header. It only exists now to keep board > >>>> code compiling. The header can be removed once the board code dependencies > >>>> to it has been removed. > >>>> > >>>> Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> > >>>> --- > >>>> include/media/soc_camera.h | 335 --------------------------------------------- > >>>> 1 file changed, 335 deletions(-) > >>>> > >>>> diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h > >>>> index b7e42a1b0910..14d19da6052a 100644 > >>>> --- a/include/media/soc_camera.h > >>>> +++ b/include/media/soc_camera.h > >>>> @@ -22,172 +22,6 @@ > >>>> #include <media/v4l2-ctrls.h> > >>>> #include <media/v4l2-device.h> > >>> > >>> That doesn't make any sense. soc_camera.h should have the same fate > >>> as the entire soc_camera infrastructure: either be removed or moved > >>> to staging, and everything else that doesn't have the same fate > >>> should get rid of this header. > >> > >> We can't just remove this; there is board code that depends on it. > >> > >> The intent is to remove the board code as well but presuming that the board > >> code would be merged through a different tree, it'd be less hassle to wait > >> a bit; hence the patch removing any unnecessary stuff here. > > > > Then we need *first* to remove board code, wait for those changes to be > > applied and *then* remove soc_camera (and not the opposite). > > Please note that the camera support for all the remaining boards using > soc_camera has been dead for years. The soc_camera drivers that they depended > on have been removed a long time ago. > > So all they depend on are the header. We can safely remove soc_camera without > loss of functionality (and thus prevent others from basing new drivers on > soc_camera), while we work to update the board files so we can remove this last > header. > > I have modified some board files here: > > https://git.linuxtv.org/hverkuil/media_tree.git/commit/?h=rm-soc-camera&id=d7ae2fcf6e447022f0780bb86a2b63d5c7cf4d35 Good! the arch-specific mach-* changes should likely be on separate patches, though. > Only arch/arm/mach-imx/mach-imx27_visstrim_m10.c hasn't been fixed yet in that > patch (ENOTIME). So, the code we don't manage seems to be just 3 archs, right (mach-omap1, mach-pxa and mach-imx)? Btw, the soc_camera dependent code at mach-imx27_visstrim_m10.c is: static struct soc_camera_link iclink_tvp5150 = { .bus_id = 0, .board_info = &visstrim_i2c_camera, .i2c_adapter_id = 0, .power = visstrim_camera_power, .reset = visstrim_camera_reset, }; ... platform_device_register_resndata(NULL, "soc-camera-pdrv", 0, NULL, 0, &iclink_tvp5150, sizeof(iclink_tvp5150)); As tvp5150 is not actually a soc_camera driver, I suspect that the conversion here would be to make it to use the tvp5150 driver directly, instead of doing it via soc_camera. > The problem is just lack of time to clean this up and figure out who should > take these board patches. No need to rush it. > So I think it is a nice solution to just replace the header with a dummy version > so the board files still compile, and then we can delete the dead soc_camera > driver. It's probably easier as well to push through the board file changes once > soc_camera is removed since you can just point out that the framework it depended > on is gone. I still think that reverting the order and rushing the removal is not the way to go. For example, on that specific imx.27 board above mentioned, it may still be working with the tvp5150 driver[1] and replacing the soc_camera.h by a dummy version would just break for no good reason. [1] I don't have such board to test, nor I checked if what's left from soc_camera still allows the tvp5150 driver to register. Thanks, Mauro
