drivers/media: fix dependencies in video mt9t001/mt9p031

  Both mt9t001.c and mt9p031.c have two identical issues, those
being that they will need module.h inclusion for the upcoming
cleanup going on there, and that their dependencies don't limit
selection of configs that will fail to compile as follows:

drivers/media/video/mt9p031.c:457: error: implicit declaration of function ‘v4l2_subdev_get_try_crop’
drivers/media/video/mt9t001.c:787: error: ‘struct v4l2_subdev’ has no member named ‘entity’

The related config options are CONFIG_MEDIA_CONTROLLER and
CONFIG_VIDEO_V4L2_SUBDEV_API.  Looking at the code, it appears
that the driver was never intended to work without these enabled,
so add a dependency on CONFIG_VIDEO_V4L2_SUBDEV_API, which in
turn already has a dependency on CONFIG_MEDIA_CONTROLLER.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
  

On 09/30/11 14:34, Paul Gortmaker wrote:
> Both mt9t001.c and mt9p031.c have two identical issues, those
> being that they will need module.h inclusion for the upcoming
> cleanup going on there, and that their dependencies don't limit
> selection of configs that will fail to compile as follows:
> 
> drivers/media/video/mt9p031.c:457: error: implicit declaration of function ‘v4l2_subdev_get_try_crop’
> drivers/media/video/mt9t001.c:787: error: ‘struct v4l2_subdev’ has no member named ‘entity’
> 
> The related config options are CONFIG_MEDIA_CONTROLLER and
> CONFIG_VIDEO_V4L2_SUBDEV_API.  Looking at the code, it appears
> that the driver was never intended to work without these enabled,
> so add a dependency on CONFIG_VIDEO_V4L2_SUBDEV_API, which in
> turn already has a dependency on CONFIG_MEDIA_CONTROLLER.
> 
> Reported-by: Randy Dunlap <rdunlap@xenotime.net>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Thanks, Paul.

> 
> diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
> index 75e43c0..d285c8c 100644
> --- a/drivers/media/video/Kconfig
> +++ b/drivers/media/video/Kconfig
> @@ -469,14 +469,14 @@ config VIDEO_OV7670
>  
>  config VIDEO_MT9P031
>  	tristate "Aptina MT9P031 support"
> -	depends on I2C && VIDEO_V4L2
> +	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
>  	---help---
>  	  This is a Video4Linux2 sensor-level driver for the Aptina
>  	  (Micron) mt9p031 5 Mpixel camera.
>  
>  config VIDEO_MT9T001
>  	tristate "Aptina MT9T001 support"
> -	depends on I2C && VIDEO_V4L2
> +	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
>  	---help---
>  	  This is a Video4Linux2 sensor-level driver for the Aptina
>  	  (Micron) mt0t001 3 Mpixel camera.
> diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c
> index 8bcb1ce..fc9603f 100644
> --- a/drivers/media/video/mt9p031.c
> +++ b/drivers/media/video/mt9p031.c
> @@ -14,6 +14,7 @@
>  
>  #include <linux/delay.h>
>  #include <linux/device.h>
> +#include <linux/module.h>
>  #include <linux/i2c.h>
>  #include <linux/log2.h>
>  #include <linux/pm.h>
> diff --git a/drivers/media/video/mt9t001.c b/drivers/media/video/mt9t001.c
> index ae75d82..280d01d 100644
> --- a/drivers/media/video/mt9t001.c
> +++ b/drivers/media/video/mt9t001.c
> @@ -13,6 +13,7 @@
>   */
>  
>  #include <linux/i2c.h>
> +#include <linux/module.h>
>  #include <linux/log2.h>
>  #include <linux/slab.h>
>  #include <linux/videodev2.h>
  

Hi Mauro,

On Fri, 30 Sep 2011 15:38:13 -0700 Randy Dunlap <rdunlap@xenotime.net> wrote:
>
> On 09/30/11 14:34, Paul Gortmaker wrote:
> > Both mt9t001.c and mt9p031.c have two identical issues, those
> > being that they will need module.h inclusion for the upcoming
> > cleanup going on there, and that their dependencies don't limit
> > selection of configs that will fail to compile as follows:
> > 
> > drivers/media/video/mt9p031.c:457: error: implicit declaration of function ‘v4l2_subdev_get_try_crop’
> > drivers/media/video/mt9t001.c:787: error: ‘struct v4l2_subdev’ has no member named ‘entity’
> > 
> > The related config options are CONFIG_MEDIA_CONTROLLER and
> > CONFIG_VIDEO_V4L2_SUBDEV_API.  Looking at the code, it appears
> > that the driver was never intended to work without these enabled,
> > so add a dependency on CONFIG_VIDEO_V4L2_SUBDEV_API, which in
> > turn already has a dependency on CONFIG_MEDIA_CONTROLLER.
> > 
> > Reported-by: Randy Dunlap <rdunlap@xenotime.net>
> > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> 
> Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Ping?
  

Em 06-10-2011 00:02, Stephen Rothwell escreveu:
> Hi Mauro,
>
> On Fri, 30 Sep 2011 15:38:13 -0700 Randy Dunlap<rdunlap@xenotime.net>  wrote:
>>
>> On 09/30/11 14:34, Paul Gortmaker wrote:
>>> Both mt9t001.c and mt9p031.c have two identical issues, those
>>> being that they will need module.h inclusion for the upcoming
>>> cleanup going on there, and that their dependencies don't limit
>>> selection of configs that will fail to compile as follows:
>>>
>>> drivers/media/video/mt9p031.c:457: error: implicit declaration of function ‘v4l2_subdev_get_try_crop’
>>> drivers/media/video/mt9t001.c:787: error: ‘struct v4l2_subdev’ has no member named ‘entity’
>>>
>>> The related config options are CONFIG_MEDIA_CONTROLLER and
>>> CONFIG_VIDEO_V4L2_SUBDEV_API.  Looking at the code, it appears
>>> that the driver was never intended to work without these enabled,
>>> so add a dependency on CONFIG_VIDEO_V4L2_SUBDEV_API, which in
>>> turn already has a dependency on CONFIG_MEDIA_CONTROLLER.
>>>
>>> Reported-by: Randy Dunlap<rdunlap@xenotime.net>
>>> Signed-off-by: Paul Gortmaker<paul.gortmaker@windriver.com>
>>
>> Acked-by: Randy Dunlap<rdunlap@xenotime.net>
>
> Ping?
>
Sorry, I was assuming that this patch would be going together with the
other module.h trees. I'll apply it on my tree.

Thanks,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  

On Sat, Oct 8, 2011 at 6:52 AM, Mauro Carvalho Chehab
<mchehab@redhat.com> wrote:
> Em 06-10-2011 00:02, Stephen Rothwell escreveu:
>>
>> Hi Mauro,
>>
>> On Fri, 30 Sep 2011 15:38:13 -0700 Randy Dunlap<rdunlap@xenotime.net>
>>  wrote:
>>>
>>> On 09/30/11 14:34, Paul Gortmaker wrote:
>>>>
>>>> Both mt9t001.c and mt9p031.c have two identical issues, those
>>>> being that they will need module.h inclusion for the upcoming
>>>> cleanup going on there, and that their dependencies don't limit
>>>> selection of configs that will fail to compile as follows:
>>>>
>>>> drivers/media/video/mt9p031.c:457: error: implicit declaration of
>>>> function ‘v4l2_subdev_get_try_crop’
>>>> drivers/media/video/mt9t001.c:787: error: ‘struct v4l2_subdev’ has no
>>>> member named ‘entity’
>>>>
>>>> The related config options are CONFIG_MEDIA_CONTROLLER and
>>>> CONFIG_VIDEO_V4L2_SUBDEV_API.  Looking at the code, it appears
>>>> that the driver was never intended to work without these enabled,
>>>> so add a dependency on CONFIG_VIDEO_V4L2_SUBDEV_API, which in
>>>> turn already has a dependency on CONFIG_MEDIA_CONTROLLER.
>>>>
>>>> Reported-by: Randy Dunlap<rdunlap@xenotime.net>
>>>> Signed-off-by: Paul Gortmaker<paul.gortmaker@windriver.com>
>>>
>>> Acked-by: Randy Dunlap<rdunlap@xenotime.net>
>>
>> Ping?
>>
> Sorry, I was assuming that this patch would be going together with the
> other module.h trees. I'll apply it on my tree.

Thanks.  Since the files in question don't exist on mainline, there is no real
way I can have it directly on the module.h tree.  If your file(s) needed the
export.h file, (which my tree creates) then I'd have carried it as a post-merge
delta to get past the chicken-and-egg problem of who's new file comes 1st.

But since your file really just needs module.h -- you can add it to your tree
right away.  Plus the Kconfig change I made really should be SOB by the
folks who know the driver restrictions; I just made an educated guess.

Paul.

>
> Thanks,
> Mauro
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html