media: mt9m001: register to V4L2 asynchronous subdevice framework

Register a sub-device to the asynchronous subdevice framework, and also
create subdevice device node.

Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 2a9e87a7ba25ad27aee8a4962845de6b938eb06c..19c112cda07862130e8300268a0f4fab772f70e5 100644 (file)
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -869,9 +869,8 @@ config VIDEO_VS6624
 
 config VIDEO_MT9M001
        tristate "mt9m001 support"
-       depends on I2C && VIDEO_V4L2
+       depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
        depends on MEDIA_CAMERA_SUPPORT
-       depends on MEDIA_CONTROLLER
        help
          This driver supports MT9M001 cameras from Micron, monochrome
          and colour models.

diff --git a/drivers/media/i2c/mt9m001.c b/drivers/media/i2c/mt9m001.c
index 0a648e2df00d660e5e494f94668c213d8f80d2fa..94c9919963b4e6f8041bbce5dc1af602df591458 100644 (file)
--- a/drivers/media/i2c/mt9m001.c
+++ b/drivers/media/i2c/mt9m001.c
@@ -720,6 +720,7 @@ static int mt9m001_probe(struct i2c_client *client,
                return PTR_ERR(mt9m001->reset_gpio);
 
        v4l2_i2c_subdev_init(&mt9m001->subdev, client, &mt9m001_subdev_ops);
+       mt9m001->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
        v4l2_ctrl_handler_init(&mt9m001->hdl, 4);
        v4l2_ctrl_new_std(&mt9m001->hdl, &mt9m001_ctrl_ops,
                        V4L2_CID_VFLIP, 0, 1, 1, 0);
@@ -768,10 +769,16 @@ static int mt9m001_probe(struct i2c_client *client,
        if (ret)
                goto error_power_off;
 
+       ret = v4l2_async_register_subdev(&mt9m001->subdev);
+       if (ret)
+               goto error_entity_cleanup;
+
        pm_runtime_idle(&client->dev);
 
        return 0;
 
+error_entity_cleanup:
+       media_entity_cleanup(&mt9m001->subdev.entity);
 error_power_off:
        pm_runtime_disable(&client->dev);
        pm_runtime_set_suspended(&client->dev);
@@ -788,9 +795,9 @@ static int mt9m001_remove(struct i2c_client *client)
 {
        struct mt9m001 *mt9m001 = to_mt9m001(client);
 
-       v4l2_device_unregister_subdev(&mt9m001->subdev);
        pm_runtime_get_sync(&client->dev);
 
+       v4l2_async_unregister_subdev(&mt9m001->subdev);
        media_entity_cleanup(&mt9m001->subdev.entity);
 
        pm_runtime_disable(&client->dev);