diff options
author | Steve Longerbeam <slongerbeam@gmail.com> | 2017-12-14 20:04:41 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-12-15 14:04:30 -0500 |
commit | f5abe1c5f9bd3e5a4dad5079f6cd51641f2bf2a3 (patch) | |
tree | 5a5cad276166e32da66d999ca58c071177f894af /drivers/staging/media/imx/imx-media-internal-sd.c | |
parent | 621b08eabcddb7a4ed6076dc91324c607be7e6b4 (diff) | |
download | linux-stable-f5abe1c5f9bd3e5a4dad5079f6cd51641f2bf2a3.tar.gz linux-stable-f5abe1c5f9bd3e5a4dad5079f6cd51641f2bf2a3.tar.bz2 linux-stable-f5abe1c5f9bd3e5a4dad5079f6cd51641f2bf2a3.zip |
media: staging/imx: of: allow for recursing downstream
Calling of_parse_subdev() recursively to a downstream path that has
already been followed is ok, it just means that call will return
immediately since the subdevice was already added to the async list.
With that there is no need to determine whether a subdevice's port
is a sink or source, so 'num_{sink|src}_pads' is no longer used and
is removed.
Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/staging/media/imx/imx-media-internal-sd.c')
-rw-r--r-- | drivers/staging/media/imx/imx-media-internal-sd.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/staging/media/imx/imx-media-internal-sd.c b/drivers/staging/media/imx/imx-media-internal-sd.c index 3e60df5f12d6..53f23830df82 100644 --- a/drivers/staging/media/imx/imx-media-internal-sd.c +++ b/drivers/staging/media/imx/imx-media-internal-sd.c @@ -78,13 +78,9 @@ struct internal_pad { static const struct internal_subdev { const struct internal_subdev_id *id; struct internal_pad pad[IMX_MEDIA_MAX_PADS]; - int num_sink_pads; - int num_src_pads; } int_subdev[num_isd] = { [isd_csi0] = { .id = &isd_id[isd_csi0], - .num_sink_pads = CSI_NUM_SINK_PADS, - .num_src_pads = CSI_NUM_SRC_PADS, .pad[CSI_SRC_PAD_DIRECT] = { .link = { { @@ -102,8 +98,6 @@ static const struct internal_subdev { [isd_csi1] = { .id = &isd_id[isd_csi1], - .num_sink_pads = CSI_NUM_SINK_PADS, - .num_src_pads = CSI_NUM_SRC_PADS, .pad[CSI_SRC_PAD_DIRECT] = { .link = { { @@ -121,8 +115,6 @@ static const struct internal_subdev { [isd_vdic] = { .id = &isd_id[isd_vdic], - .num_sink_pads = VDIC_NUM_SINK_PADS, - .num_src_pads = VDIC_NUM_SRC_PADS, .pad[VDIC_SRC_PAD_DIRECT] = { .link = { { @@ -136,8 +128,6 @@ static const struct internal_subdev { [isd_ic_prp] = { .id = &isd_id[isd_ic_prp], - .num_sink_pads = PRP_NUM_SINK_PADS, - .num_src_pads = PRP_NUM_SRC_PADS, .pad[PRP_SRC_PAD_PRPENC] = { .link = { { @@ -160,14 +150,10 @@ static const struct internal_subdev { [isd_ic_prpenc] = { .id = &isd_id[isd_ic_prpenc], - .num_sink_pads = PRPENCVF_NUM_SINK_PADS, - .num_src_pads = PRPENCVF_NUM_SRC_PADS, }, [isd_ic_prpvf] = { .id = &isd_id[isd_ic_prpvf], - .num_sink_pads = PRPENCVF_NUM_SINK_PADS, - .num_src_pads = PRPENCVF_NUM_SRC_PADS, }, }; @@ -312,9 +298,6 @@ static int add_internal_subdev(struct imx_media_dev *imxmd, if (IS_ERR(imxsd)) return PTR_ERR(imxsd); - imxsd->num_sink_pads = isd->num_sink_pads; - imxsd->num_src_pads = isd->num_src_pads; - return 0; } |