summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@linux.intel.com>2016-09-07 08:55:34 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-10-21 15:07:38 -0200
commita118e61edc3e54bd727a6f6d7193e40270cd3711 (patch)
treef75a7f66c2aada9794bbb802706521a2d860ade6 /drivers/media/i2c
parent1344bf74c93b87fdc5c8d4f1612470b4c3c2906f (diff)
downloadlinux-0-day-a118e61edc3e54bd727a6f6d7193e40270cd3711.tar.gz
linux-0-day-a118e61edc3e54bd727a6f6d7193e40270cd3711.tar.xz
[media] smiapp: Unify setting up sub-devices
The initialisation of the source sub-device is somewhat different as it's not created by the smiapp driver itself. Remove redundancy in initialising the two kind of sub-devices. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Reviewed-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/smiapp/smiapp-core.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 6ec17eab70ac7..7ac0d4e0cc897 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2591,6 +2591,7 @@ static void smiapp_create_subdev(struct smiapp_sensor *sensor,
if (ssd != sensor->src)
v4l2_subdev_init(&ssd->sd, &smiapp_ops);
+ ssd->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
ssd->sensor = sensor;
ssd->npads = num_pads;
@@ -2616,7 +2617,6 @@ static void smiapp_create_subdev(struct smiapp_sensor *sensor,
if (ssd == sensor->src)
return;
- ssd->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
ssd->sd.internal_ops = &smiapp_internal_ops;
ssd->sd.owner = THIS_MODULE;
v4l2_set_subdevdata(&ssd->sd, client);
@@ -2861,9 +2861,6 @@ static int smiapp_probe(struct i2c_client *client,
v4l2_i2c_subdev_init(&sensor->src->sd, client, &smiapp_ops);
sensor->src->sd.internal_ops = &smiapp_internal_src_ops;
- sensor->src->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
- sensor->src->sensor = sensor;
- sensor->src->pads[0].flags = MEDIA_PAD_FL_SOURCE;
sensor->vana = devm_regulator_get(&client->dev, "vana");
if (IS_ERR(sensor->vana)) {