| Message ID | 20230630110643.209761-12-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: ipu-bridge: Shared with atomisp, rework VCM instantiation | expand |
On Fri, Jun 30, 2023 at 2:07 PM Hans de Goede <hdegoede@redhat.com> wrote: > > Move ipu-bridge.h to include/media/, so that it can also be used by > the atomisp code. Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/media/pci/intel/ipu-bridge.c | 4 ++-- > drivers/media/pci/intel/ipu3/ipu3-cio2.c | 3 ++- > {drivers/media/pci/intel => include/media}/ipu-bridge.h | 0 > 3 files changed, 4 insertions(+), 3 deletions(-) > rename {drivers/media/pci/intel => include/media}/ipu-bridge.h (100%) > > diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel/ipu-bridge.c > index d60992fbdbeb..eb7c56e8ef9f 100644 > --- a/drivers/media/pci/intel/ipu-bridge.c > +++ b/drivers/media/pci/intel/ipu-bridge.c > @@ -5,9 +5,9 @@ > #include <linux/device.h> > #include <linux/i2c.h> > #include <linux/property.h> > -#include <media/v4l2-fwnode.h> > > -#include "ipu-bridge.h" > +#include <media/ipu-bridge.h> > +#include <media/v4l2-fwnode.h> > > /* > * Extend this array with ACPI Hardware IDs of devices known to be working > diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c > index 26c4c1375990..51a6d7cc44d2 100644 > --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c > +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c > @@ -22,6 +22,8 @@ > #include <linux/pm_runtime.h> > #include <linux/property.h> > #include <linux/vmalloc.h> > + > +#include <media/ipu-bridge.h> > #include <media/v4l2-ctrls.h> > #include <media/v4l2-device.h> > #include <media/v4l2-event.h> > @@ -29,7 +31,6 @@ > #include <media/v4l2-ioctl.h> > #include <media/videobuf2-dma-sg.h> > > -#include "../ipu-bridge.h" > #include "ipu3-cio2.h" > > struct ipu3_cio2_fmt { > diff --git a/drivers/media/pci/intel/ipu-bridge.h b/include/media/ipu-bridge.h > similarity index 100% > rename from drivers/media/pci/intel/ipu-bridge.h > rename to include/media/ipu-bridge.h > -- > 2.41.0 >
diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel/ipu-bridge.c index d60992fbdbeb..eb7c56e8ef9f 100644 --- a/drivers/media/pci/intel/ipu-bridge.c +++ b/drivers/media/pci/intel/ipu-bridge.c @@ -5,9 +5,9 @@ #include <linux/device.h> #include <linux/i2c.h> #include <linux/property.h> -#include <media/v4l2-fwnode.h> -#include "ipu-bridge.h" +#include <media/ipu-bridge.h> +#include <media/v4l2-fwnode.h> /* * Extend this array with ACPI Hardware IDs of devices known to be working diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c index 26c4c1375990..51a6d7cc44d2 100644 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c @@ -22,6 +22,8 @@ #include <linux/pm_runtime.h> #include <linux/property.h> #include <linux/vmalloc.h> + +#include <media/ipu-bridge.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-event.h> @@ -29,7 +31,6 @@ #include <media/v4l2-ioctl.h> #include <media/videobuf2-dma-sg.h> -#include "../ipu-bridge.h" #include "ipu3-cio2.h" struct ipu3_cio2_fmt { diff --git a/drivers/media/pci/intel/ipu-bridge.h b/include/media/ipu-bridge.h similarity index 100% rename from drivers/media/pci/intel/ipu-bridge.h rename to include/media/ipu-bridge.h
Move ipu-bridge.h to include/media/, so that it can also be used by the atomisp code. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/media/pci/intel/ipu-bridge.c | 4 ++-- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 3 ++- {drivers/media/pci/intel => include/media}/ipu-bridge.h | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename {drivers/media/pci/intel => include/media}/ipu-bridge.h (100%)