diff options
| author |   Ezequiel Garcia <ezequiel@collabora.com> | 2019-08-15 13:48:05 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-08-26 10:52:06 -0300 |
| commit | 51ff392c280733aa9e6bd47b3f5e83e32bfdf16a (patch) | |
| tree | b61a41e79f08d1a3a1fe26c0d5946f5faccbfe03 /drivers/media/v4l2-core/v4l2-i2c.c | |
| parent | media: v4l2-core: introduce a helper to unregister a spi subdev (diff) | |
| download | linux-dev-51ff392c280733aa9e6bd47b3f5e83e32bfdf16a.tar.xz linux-dev-51ff392c280733aa9e6bd47b3f5e83e32bfdf16a.zip | |
media: v4l2-core: introduce a helper to unregister a i2c subdev
Introduce a new video4linux2 i2c helper, to unregister a subdev.
This allows to get rid of yet another ifdef.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: fix checkpatch warning]
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-i2c.c')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-i2c.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/v4l2-i2c.c b/drivers/media/v4l2-core/v4l2-i2c.c index f393dd4f1c00..a26d48f23a2d 100644 --- a/drivers/media/v4l2-core/v4l2-i2c.c +++ b/drivers/media/v4l2-core/v4l2-i2c.c @@ -8,6 +8,26 @@ #include <media/v4l2-common.h> #include <media/v4l2-device.h> +void v4l2_i2c_subdev_unregister(struct v4l2_subdev *sd) +{ + struct i2c_client *client = v4l2_get_subdevdata(sd); + + /* + * We need to unregister the i2c client + * explicitly. We cannot rely on + * i2c_del_adapter to always unregister + * clients for us, since if the i2c bus is a + * platform bus, then it is never deleted. + * + * Device tree or ACPI based devices must not + * be unregistered as they have not been + * registered by us, and would not be + * re-created by just probing the V4L2 driver. + */ + if (client && !client->dev.of_node && !client->dev.fwnode) + i2c_unregister_device(client); +} + void v4l2_i2c_subdev_set_name(struct v4l2_subdev *sd, struct i2c_client *client, const char *devname, const char *postfix) { |