| Message ID | 20221212194716.2995569-2-m.grzeschik@pengutronix.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | usb: uvc: improve header files and function use | expand |
Hi Michael, Thank you for the patch. On Mon, Dec 12, 2022 at 08:47:12PM +0100, Michael Grzeschik wrote: > Since the headerfile is only used in usb devices it is better > placed with the other usb files. > > Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/usb/uvc/uvc_ctrl.c | 2 +- > drivers/media/usb/uvc/uvc_driver.c | 2 +- > drivers/usb/gadget/function/uvc_v4l2.c | 2 +- > include/{media/v4l2-uvc.h => linux/usb/uvc.h} | 0 > 4 files changed, 3 insertions(+), 3 deletions(-) > rename include/{media/v4l2-uvc.h => linux/usb/uvc.h} (100%) > > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c > index c95a2229f4fa9f..454d4374990ea1 100644 > --- a/drivers/media/usb/uvc/uvc_ctrl.c > +++ b/drivers/media/usb/uvc/uvc_ctrl.c > @@ -12,13 +12,13 @@ > #include <linux/slab.h> > #include <linux/uaccess.h> > #include <linux/usb.h> > +#include <linux/usb/uvc.h> > #include <linux/videodev2.h> > #include <linux/vmalloc.h> > #include <linux/wait.h> > #include <linux/workqueue.h> > #include <linux/atomic.h> > #include <media/v4l2-ctrls.h> > -#include <media/v4l2-uvc.h> > > #include "uvcvideo.h" > > diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c > index 215fb483efb00b..13023cdd37e50b 100644 > --- a/drivers/media/usb/uvc/uvc_driver.c > +++ b/drivers/media/usb/uvc/uvc_driver.c > @@ -13,6 +13,7 @@ > #include <linux/module.h> > #include <linux/slab.h> > #include <linux/usb.h> > +#include <linux/usb/uvc.h> > #include <linux/videodev2.h> > #include <linux/vmalloc.h> > #include <linux/wait.h> > @@ -20,7 +21,6 @@ > > #include <media/v4l2-common.h> > #include <media/v4l2-ioctl.h> > -#include <media/v4l2-uvc.h> > > #include "uvcvideo.h" > > diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c > index a189b08bba800d..7435df0cf2a847 100644 > --- a/drivers/usb/gadget/function/uvc_v4l2.c > +++ b/drivers/usb/gadget/function/uvc_v4l2.c > @@ -11,6 +11,7 @@ > #include <linux/kernel.h> > #include <linux/list.h> > #include <linux/usb/g_uvc.h> > +#include <linux/usb/uvc.h> > #include <linux/videodev2.h> > #include <linux/vmalloc.h> > #include <linux/wait.h> > @@ -18,7 +19,6 @@ > #include <media/v4l2-dev.h> > #include <media/v4l2-event.h> > #include <media/v4l2-ioctl.h> > -#include <media/v4l2-uvc.h> > > #include "f_uvc.h" > #include "uvc.h" > diff --git a/include/media/v4l2-uvc.h b/include/linux/usb/uvc.h > similarity index 100% > rename from include/media/v4l2-uvc.h > rename to include/linux/usb/uvc.h
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index c95a2229f4fa9f..454d4374990ea1 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -12,13 +12,13 @@ #include <linux/slab.h> #include <linux/uaccess.h> #include <linux/usb.h> +#include <linux/usb/uvc.h> #include <linux/videodev2.h> #include <linux/vmalloc.h> #include <linux/wait.h> #include <linux/workqueue.h> #include <linux/atomic.h> #include <media/v4l2-ctrls.h> -#include <media/v4l2-uvc.h> #include "uvcvideo.h" diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 215fb483efb00b..13023cdd37e50b 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/usb.h> +#include <linux/usb/uvc.h> #include <linux/videodev2.h> #include <linux/vmalloc.h> #include <linux/wait.h> @@ -20,7 +21,6 @@ #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> -#include <media/v4l2-uvc.h> #include "uvcvideo.h" diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c index a189b08bba800d..7435df0cf2a847 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/list.h> #include <linux/usb/g_uvc.h> +#include <linux/usb/uvc.h> #include <linux/videodev2.h> #include <linux/vmalloc.h> #include <linux/wait.h> @@ -18,7 +19,6 @@ #include <media/v4l2-dev.h> #include <media/v4l2-event.h> #include <media/v4l2-ioctl.h> -#include <media/v4l2-uvc.h> #include "f_uvc.h" #include "uvc.h" diff --git a/include/media/v4l2-uvc.h b/include/linux/usb/uvc.h similarity index 100% rename from include/media/v4l2-uvc.h rename to include/linux/usb/uvc.h
Since the headerfile is only used in usb devices it is better placed with the other usb files. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> --- drivers/media/usb/uvc/uvc_ctrl.c | 2 +- drivers/media/usb/uvc/uvc_driver.c | 2 +- drivers/usb/gadget/function/uvc_v4l2.c | 2 +- include/{media/v4l2-uvc.h => linux/usb/uvc.h} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename include/{media/v4l2-uvc.h => linux/usb/uvc.h} (100%)