| Message ID | 20240430213633.23767-1-laurent.pinchart@ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series | media: bcm2835-unicam: Fix compilation errors and warnings | expand |
Hi Laurent This is a dupe of: https://patchwork.linuxtv.org/project/linux-media/patch/20240430-fix-ipu6-v1-1-9b31fbbce6e4@chromium.org/ regards! On Tue, Apr 30, 2024 at 11:39 PM Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > > Using of_match_ptr() to set the .of_match_table field of the device > driver results in the unicam_of_match table being unused on non-OF > platforms, causing a compilation warning. Fix it by dropping usage of > of_match_ptr(), which can be done because the .of_match_table field is > part of the device_driver structure regardless of whether or not > CONFIG_OF is selected. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202404302324.8aTC84kE-lkp@intel.com/ > --- > drivers/media/platform/broadcom/bcm2835-unicam.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/media/platform/broadcom/bcm2835-unicam.c > index bd2bbb53070e..c590e26fe2cf 100644 > --- a/drivers/media/platform/broadcom/bcm2835-unicam.c > +++ b/drivers/media/platform/broadcom/bcm2835-unicam.c > @@ -2733,7 +2733,7 @@ static struct platform_driver unicam_driver = { > .driver = { > .name = UNICAM_MODULE_NAME, > .pm = pm_ptr(&unicam_pm_ops), > - .of_match_table = of_match_ptr(unicam_of_match), > + .of_match_table = unicam_of_match, > }, > }; > > -- > Regards, > > Laurent Pinchart > >
Hi Laurent I have to send a v2 of https://patchwork.linuxtv.org/project/linux-media/list/?series=12759 I can include this patch in that set if you want Regards! On Tue, Apr 30, 2024 at 11:39 PM Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > > The unicam driver uses the v4l2_subdev structure. Include the > corresponding header instead of relying on indirect includes. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Reported-by: kernel test robot <lkp@intel.com> Reviewed-by: Ricardo Ribalda <ribalda@chromium.org> > Closes: https://lore.kernel.org/oe-kbuild-all/202404302324.8aTC84kE-lkp@intel.com/ > --- > drivers/media/platform/broadcom/bcm2835-unicam.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/media/platform/broadcom/bcm2835-unicam.c > index c590e26fe2cf..3c7878d8d79b 100644 > --- a/drivers/media/platform/broadcom/bcm2835-unicam.c > +++ b/drivers/media/platform/broadcom/bcm2835-unicam.c > @@ -55,6 +55,7 @@ > #include <media/v4l2-ioctl.h> > #include <media/v4l2-fwnode.h> > #include <media/v4l2-mc.h> > +#include <media/v4l2-subdev.h> > #include <media/videobuf2-dma-contig.h> > > #include "bcm2835-unicam-regs.h" > -- > Regards, > > Laurent Pinchart > >
Hi Ricardo, On Wed, May 01, 2024 at 01:07:29PM +0200, Ricardo Ribalda Delgado wrote: > Hi Laurent > > I have to send a v2 of > https://patchwork.linuxtv.org/project/linux-media/list/?series=12759 I > can include this patch in that set if you want Fine with me. > On Tue, Apr 30, 2024 at 11:39 PM Laurent Pinchart wrote: > > > > The unicam driver uses the v4l2_subdev structure. Include the > > corresponding header instead of relying on indirect includes. > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Reported-by: kernel test robot <lkp@intel.com> > Reviewed-by: Ricardo Ribalda <ribalda@chromium.org> > > Closes: https://lore.kernel.org/oe-kbuild-all/202404302324.8aTC84kE-lkp@intel.com/ > > --- > > drivers/media/platform/broadcom/bcm2835-unicam.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/media/platform/broadcom/bcm2835-unicam.c > > index c590e26fe2cf..3c7878d8d79b 100644 > > --- a/drivers/media/platform/broadcom/bcm2835-unicam.c > > +++ b/drivers/media/platform/broadcom/bcm2835-unicam.c > > @@ -55,6 +55,7 @@ > > #include <media/v4l2-ioctl.h> > > #include <media/v4l2-fwnode.h> > > #include <media/v4l2-mc.h> > > +#include <media/v4l2-subdev.h> > > #include <media/videobuf2-dma-contig.h> > > > > #include "bcm2835-unicam-regs.h"
On Wed, May 01, 2024 at 02:47:15PM +0300, Laurent Pinchart wrote: > On Wed, May 01, 2024 at 01:07:29PM +0200, Ricardo Ribalda Delgado wrote: > > Hi Laurent > > > > I have to send a v2 of > > https://patchwork.linuxtv.org/project/linux-media/list/?series=12759 I > > can include this patch in that set if you want > > Fine with me. Assuming your v2 will be merged in v6.10. > > On Tue, Apr 30, 2024 at 11:39 PM Laurent Pinchart wrote: > > > > > > The unicam driver uses the v4l2_subdev structure. Include the > > > corresponding header instead of relying on indirect includes. > > > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > Reported-by: kernel test robot <lkp@intel.com> > > Reviewed-by: Ricardo Ribalda <ribalda@chromium.org> > > > Closes: https://lore.kernel.org/oe-kbuild-all/202404302324.8aTC84kE-lkp@intel.com/ > > > --- > > > drivers/media/platform/broadcom/bcm2835-unicam.c | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/media/platform/broadcom/bcm2835-unicam.c > > > index c590e26fe2cf..3c7878d8d79b 100644 > > > --- a/drivers/media/platform/broadcom/bcm2835-unicam.c > > > +++ b/drivers/media/platform/broadcom/bcm2835-unicam.c > > > @@ -55,6 +55,7 @@ > > > #include <media/v4l2-ioctl.h> > > > #include <media/v4l2-fwnode.h> > > > #include <media/v4l2-mc.h> > > > +#include <media/v4l2-subdev.h> > > > #include <media/videobuf2-dma-contig.h> > > > > > > #include "bcm2835-unicam-regs.h"
diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/media/platform/broadcom/bcm2835-unicam.c index bd2bbb53070e..c590e26fe2cf 100644 --- a/drivers/media/platform/broadcom/bcm2835-unicam.c +++ b/drivers/media/platform/broadcom/bcm2835-unicam.c @@ -2733,7 +2733,7 @@ static struct platform_driver unicam_driver = { .driver = { .name = UNICAM_MODULE_NAME, .pm = pm_ptr(&unicam_pm_ops), - .of_match_table = of_match_ptr(unicam_of_match), + .of_match_table = unicam_of_match, }, };
Using of_match_ptr() to set the .of_match_table field of the device driver results in the unicam_of_match table being unused on non-OF platforms, causing a compilation warning. Fix it by dropping usage of of_match_ptr(), which can be done because the .of_match_table field is part of the device_driver structure regardless of whether or not CONFIG_OF is selected. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202404302324.8aTC84kE-lkp@intel.com/ --- drivers/media/platform/broadcom/bcm2835-unicam.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)