[media] media: Pick a free ioctls range

Pick an unused range of ioctls in Documentation/ioctl/ioctl-number.txt
and use it for the MEDIA_IOC_* ioctls.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 5 insertions, 4 deletions

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index ac293e955308..2b8c0592b519 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -272,6 +272,7 @@ Code  Seq#(hex)	Include File		Comments
 'z'     40-7F                           CAN bus card    conflict!
                                         <mailto:oe@port.de>
 'z'     10-4F   drivers/s390/crypto/zcrypt_api.h        conflict!
+'|'     00-7F   linux/media.h
 0x80    00-1F   linux/fb.h
 0x89    00-06   arch/x86/include/asm/sockios.h
 0x89    0B-DF   linux/sockios.h
diff --git a/include/linux/media.h b/include/linux/media.h
index 7ed23b43f43b..0ef883327de2 100644
--- a/include/linux/media.h
+++ b/include/linux/media.h
@@ -124,9 +124,9 @@ struct media_links_enum {
         __u32 reserved[4];
 };
 
-#define MEDIA_IOC_DEVICE_INFO           _IOWR('M', 1, struct media_device_info)
-#define MEDIA_IOC_ENUM_ENTITIES         _IOWR('M', 2, struct media_entity_desc)
-#define MEDIA_IOC_ENUM_LINKS            _IOWR('M', 3, struct media_links_enum)
-#define MEDIA_IOC_SETUP_LINK            _IOWR('M', 4, struct media_link_desc)
+#define MEDIA_IOC_DEVICE_INFO           _IOWR('|', 0x00, struct media_device_info)
+#define MEDIA_IOC_ENUM_ENTITIES         _IOWR('|', 0x01, struct media_entity_desc)
+#define MEDIA_IOC_ENUM_LINKS            _IOWR('|', 0x02, struct media_links_enum)
+#define MEDIA_IOC_SETUP_LINK            _IOWR('|', 0x03, struct media_link_desc)
 
 #endif /* __LINUX_MEDIA_H */