Skip to contentSkip to conversation

V4L1 cleanups and videodev.h removal

PATCH In review Mauro Carvalho Chehab 2 participants 5 messages Dec 27, 2010 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

cover V4L1 cleanups and videodev.h removal

Now that all hard work to remove V4L1 happened, it doesn't make sense on keeping videodev.h just because of two obsoleted drivers.

Let's just remove this thing and copy it to the two staging drivers that still needs it.

While here, fix the remaining bits that were hit by:

	$ git grep videodev.h

After this series, the only places where videodev.h will show will be at the V4L2 DocBook document that describes the migration (compat.xml) and 3 drivers at staging: the two deprecated drivers and a very messy driver for a few easycap boards that has its own internal copy of videodev.h.

Mauro Carvalho Chehab (6):
[media] Remove VIDEO_V4L1 Kconfig option
[media] V4L1 removal: Remove linux/videodev.h Documentation/ioctl/ioctl-number.txt: Remove some now freed ioctl
ranges
[media] Fix videodev.h references at the V4L DocBook [media] Remove the old V4L1 v4lgrab.c file
[media] omap_vout: Remove an obsolete comment

 Documentation/DocBook/v4l/func-ioctl.xml   |    5 +-
 Documentation/DocBook/v4l/pixfmt.xml       |    4 +-
 Documentation/feature-removal-schedule.txt |   17 --
 Documentation/ioctl/ioctl-number.txt       |    3 -
 Documentation/video4linux/v4lgrab.c        |  201 -----------------
 drivers/media/Kconfig                      |   14 --
 drivers/media/video/Kconfig                |    5 -
 drivers/media/video/omap/omap_vout.c       |    1 -
 drivers/media/video/v4l2-compat-ioctl32.c  |    1 -
 drivers/staging/se401/Kconfig              |    2 +-
 drivers/staging/se401/se401.h              |    2 +-
 drivers/staging/se401/videodev.h           |  318 +++++++++++++++++++++++++++
 drivers/staging/usbvideo/Kconfig           |    2 +-
 drivers/staging/usbvideo/usbvideo.h        |    2 +-
 drivers/staging/usbvideo/vicam.c           |    2 +-
 drivers/staging/usbvideo/videodev.h        |  318 +++++++++++++++++++++++++++
 fs/compat_ioctl.c                          |    2 +-
 include/linux/Kbuild                       |    1 -
 include/linux/videodev.h                   |  322 ----------------------------
 include/media/ovcamchip.h                  |   90 --------
 20 files changed, 646 insertions(+), 666 deletions(-)
 delete mode 100644 Documentation/video4linux/v4lgrab.c
 create mode 100644 drivers/staging/se401/videodev.h
 create mode 100644 drivers/staging/usbvideo/videodev.h
 delete mode 100644 include/linux/videodev.h
 delete mode 100644 include/media/ovcamchip.h
Signature · 1 line
1.7.3.4
#1 lore raw
Quoted 2 lines · On Monday, December 27, 2010 12:38:48 Mauro Carvalho Chehab wrote:

Now that all hard work to remove V4L1 happened, it doesn't make sense on keeping videodev.h just because of two obsoleted drivers.

Perhaps it is also time to mark the videodev2.h _OLD ioctls for removal in 2.6.39?

If we are getting rid of old stuff anyway, then this will also be a nice cleanup.

Perhaps we can even delete it without marking it for removal. After all, removing it will only affect binaries compiled against a *really* old kernel (I suspect 2.5.something). Anything that has been recompiled will automatically use the correct ioctls.

Regards,

Hans

Signature · 1 line
Hans Verkuil - video4linux developer - sponsored by Cisco
#2 lore raw

Em 27-12-2010 10:21, Hans Verkuil escreveu:

Quoted 7 lines · On Monday, December 27, 2010 12:38:48 Mauro Carvalho Chehab wrote:
Quoted 2 lines

Now that all hard work to remove V4L1 happened, it doesn't make sense on keeping videodev.h just because of two obsoleted drivers.

Perhaps it is also time to mark the videodev2.h _OLD ioctls for removal in 2.6.39?

Quoted 7 lines

If we are getting rid of old stuff anyway, then this will also be a nice cleanup.

Perhaps we can even delete it without marking it for removal. After all, removing it will only affect binaries compiled against a *really* old kernel (I suspect 2.5.something). Anything that has been recompiled will automatically use the correct ioctls.

We can't just remove the _OLD, as they're used internally, in order to handle those old binaries. I think that not all come from 2.5 times. So, the better is to mark them to be removed for .39.

Quoted 5 lines

Regards,

Hans

#3 lore raw
Quoted 11 lines · On Monday, December 27, 2010 13:33:52 Mauro Carvalho Chehab wrote:

Em 27-12-2010 10:21, Hans Verkuil escreveu:

Quoted 10 lines · On Monday, December 27, 2010 12:38:48 Mauro Carvalho Chehab wrote:
Quoted 2 lines

Now that all hard work to remove V4L1 happened, it doesn't make sense on keeping videodev.h just because of two obsoleted drivers.

Perhaps it is also time to mark the videodev2.h _OLD ioctls for removal in 2.6.39?

If we are getting rid of old stuff anyway, then this will also be a nice cleanup.

Quoted 8 lines
Quoted 4 lines

Perhaps we can even delete it without marking it for removal. After all, removing it will only affect binaries compiled against a *really* old kernel (I suspect 2.5.something). Anything that has been recompiled will automatically use the correct ioctls.

We can't just remove the _OLD, as they're used internally, in order to handle those old binaries. I think that not all come from 2.5 times. So, the better is to mark them to be removed for .39.

I double checked and they were introduced in 2.6.2 except for CROPCAP_OLD which was introduced in 2.6.6.

Do you want me to mark them for removal or will you?

Regards,

Hans

Signature · 1 line
Hans Verkuil - video4linux developer - sponsored by Cisco
#4 lore raw

Em 27-12-2010 10:45, Hans Verkuil escreveu:

Quoted 17 lines · On Monday, December 27, 2010 13:33:52 Mauro Carvalho Chehab wrote:
Quoted 16 lines

Em 27-12-2010 10:21, Hans Verkuil escreveu:

Quoted 14 lines · On Monday, December 27, 2010 12:38:48 Mauro Carvalho Chehab wrote:
Quoted 2 lines

Now that all hard work to remove V4L1 happened, it doesn't make sense on keeping videodev.h just because of two obsoleted drivers.

Perhaps it is also time to mark the videodev2.h _OLD ioctls for removal in 2.6.39?

If we are getting rid of old stuff anyway, then this will also be a nice cleanup.

Perhaps we can even delete it without marking it for removal. After all, removing it will only affect binaries compiled against a *really* old kernel (I suspect 2.5.something). Anything that has been recompiled will automatically use the correct ioctls.

Quoted 6 lines
Quoted 3 lines

We can't just remove the _OLD, as they're used internally, in order to handle those old binaries. I think that not all come from 2.5 times. So, the better is to mark them to be removed for .39.

I double checked and they were introduced in 2.6.2 except for CROPCAP_OLD which was introduced in 2.6.6.

Thanks for the research.

Quoted 2 lines

Do you want me to mark them for removal or will you?

I did it. Just sent to the ML. I'm basically with my hands tight, as kernel's Patchwork is not working today, so I have some time to do some basic cleanup, while waiting for someone to restart patchwork service.

Cheers,
Mauro