[1/1] media: entity: Add a nop variant of media_entity_cleanupr

Commit Message

Arnd Bergmann Jan. 10, 2018, 5 p.m. UTC

On Tue, Jan 9, 2018 at 11:31 PM, Sakari Ailus
<[e-mail]> wrote:

>>         depends on VIDEO_V4L2_SUBDEV_API
>>         ---help---
>>           This is a driver for the DW9714 camera lens voice coil.
>> @@ -636,7 +636,6 @@ config VIDEO_OV5670
>>         tristate "OmniVision OV5670 sensor support"
>>         depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
>>         depends on MEDIA_CAMERA_SUPPORT
>> -       depends on MEDIA_CONTROLLER
>
> ov5670 does depend on MC at least right now. I guess it might not take much
> to make it optional. But it's more than this patch. :-)
>
>>         select V4L2_FWNODE
>>         ---help---
>>           This is a Video4Linux2 sensor-level driver for the OmniVision
>> @@ -667,7 +666,7 @@ config VIDEO_OV7670
>>
>>  config VIDEO_OV7740
>>         tristate "OmniVision OV7740 sensor support"
>> -       depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
>> +       depends on I2C && VIDEO_V4L2
>
> Hmm. In here the ov7740 driver doesn't seem to depend on MC.

Right, this was on top of the earlier patch I sent that you rejected ;-)

>>         depends on MEDIA_CAMERA_SUPPORT
>>         ---help---
>>           This is a Video4Linux2 sensor-level driver for the OmniVision
>> @@ -815,7 +814,7 @@ comment "Flash devices"
>>
>>  config VIDEO_ADP1653
>>         tristate "ADP1653 flash support"
>> -       depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
>> +       depends on I2C && VIDEO_V4L2
>>         depends on MEDIA_CAMERA_SUPPORT
>>         ---help---
>>           This is a driver for the ADP1653 flash controller. It is used for
>> @@ -823,7 +822,7 @@ config VIDEO_ADP1653
>>
>>  config VIDEO_LM3560
>>         tristate "LM3560 dual flash driver support"
>> -       depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
>> +       depends on I2C && VIDEO_V4L2
>>         depends on MEDIA_CAMERA_SUPPORT
>>         select REGMAP_I2C
>>         ---help---

Those two also failed to build

>> @@ -832,7 +831,7 @@ config VIDEO_LM3560
>>
>>  config VIDEO_LM3646
>>         tristate "LM3646 dual flash driver support"
>> -       depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
>> +       depends on I2C && VIDEO_V4L2
>>         depends on MEDIA_CAMERA_SUPPORT
>>         select REGMAP_I2C
>>         ---help---
>
> These also call media_entity_pads_init() unconditionally.
>
> How was this tested? :-)

Not before I sent it, what I meant is that I'd give it a try, blindly applying
the patch to my randconfig build tree to see what breaks.

The result after a day worth of randconfig builds is this one, which
basically matches what you concluded already:

  *

I'll just drop that patch then from my build tree.

         Arnd

Patch

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 03cf3a1a1e06..5d465221fbfa 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -310,14 +310,14 @@  config VIDEO_ML86V7667

 config VIDEO_AD5820
        tristate "AD5820 lens voice coil support"
-       depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
+       depends on I2C && VIDEO_V4L2
        ---help---
          This is a driver for the AD5820 camera lens voice coil.
          It is used for example in Nokia N900 (RX-51).

 config VIDEO_DW9714
        tristate "DW9714 lens voice coil support"
-       depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
+       depends on I2C && VIDEO_V4L2
        depends on VIDEO_V4L2_SUBDEV_API
        ---help---
          This is a driver for the DW9714 camera lens voice coil.
@@ -636,7 +636,6 @@  config VIDEO_OV5670
        tristate "OmniVision OV5670 sensor support"
        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
        depends on MEDIA_CAMERA_SUPPORT
-       depends on MEDIA_CONTROLLER
        select V4L2_FWNODE
        ---help---
          This is a Video4Linux2 sensor-level driver for the OmniVision
@@ -667,7 +666,7 @@  config VIDEO_OV7670

 config VIDEO_OV7740
        tristate "OmniVision OV7740 sensor support"
-       depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
+       depends on I2C && VIDEO_V4L2
        depends on MEDIA_CAMERA_SUPPORT
        ---help---
          This is a Video4Linux2 sensor-level driver for the OmniVision
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index d7a669058b5e..3f34a1126bd1 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -636,6 +636,11 @@  int media_entity_pads_init(struct media_entity
*entity, u16 num_pads,
  */
 static inline void media_entity_cleanup(struct media_entity *entity) {};

+#ifndef CONFIG_MEDIA_CONTROLLER
+#define media_entity_pads_init(e, n, p) 0
+#define media_entity_cleanup(e) do { } while (0)
+#endif
+
 /**
  * media_create_pad_link() - creates a link between two entities.