diff for duplicates of <20151012130013.5b7dcbb0@recife.lan> diff --git a/a/1.txt b/N1/1.txt index d5608a6..1b6b6d2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,7 +33,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > while (pad->flags & MEDIA_PAD_FL_SINK) { > > > > /* source pad */ > > > > pad = media_entity_remote_pad(pad); -> > > > - if (pad == NULL || +> > > > - if (pad = NULL || > > > > - media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) > > > > break; @@ -47,7 +47,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > } > > > > } > > > > -> > > > - if (src_pad == NULL || +> > > > - if (src_pad = NULL || > > > > - media_entity_type(src_pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!src_pad || !is_media_entity_v4l2_subdev(src_pad->entity)) > > > > break; @@ -61,7 +61,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > + if (!is_media_entity_v4l2_subdev(remote->entity)) > > > > return -EINVAL; > > > > -> > > > if (WARN_ON(fimc == NULL)) +> > > > if (WARN_ON(fimc = NULL)) > > > > diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c > > > > index 3d9ccbf5f10f..5fbaf5e39903 100644 > > > > --- a/drivers/media/platform/exynos4-is/fimc-isp-video.c @@ -70,7 +70,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > > > > > /* Retrieve format at the source pad */ > > > > pad = media_entity_remote_pad(pad); -> > > > - if (pad == NULL || +> > > > - if (pad = NULL || > > > > - media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) > > > > break; @@ -84,7 +84,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > } > > > > /* Retrieve format at the source pad */ > > > > pad = media_entity_remote_pad(pad); -> > > > - if (pad == NULL || +> > > > - if (pad = NULL || > > > > - media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) > > > > break; @@ -97,7 +97,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > - unsigned int remote_ent_type = media_entity_type(remote->entity); > > > > int ret = 0; > > > > -> > > > if (WARN_ON(fimc == NULL)) +> > > > if (WARN_ON(fimc = NULL)) > > > > @@ -1000,7 +998,7 @@ static int fimc_lite_link_setup(struct media_entity *entity, > > > > > > > > switch (local->index) { @@ -111,7 +111,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > case FLITE_SD_PAD_SOURCE_DMA: > > > > if (!(flags & MEDIA_LNK_FL_ENABLED)) > > > > atomic_set(&fimc->out_path, FIMC_IO_NONE); -> > > > - else if (remote_ent_type == MEDIA_ENT_T_DEVNODE) +> > > > - else if (remote_ent_type = MEDIA_ENT_T_DEVNODE) > > > > + else if (is_media_entity_v4l2_io(remote->entity)) > > > > atomic_set(&fimc->out_path, FIMC_IO_DMA); > > > > else @@ -120,7 +120,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > case FLITE_SD_PAD_SOURCE_ISP: > > > > if (!(flags & MEDIA_LNK_FL_ENABLED)) > > > > atomic_set(&fimc->out_path, FIMC_IO_NONE); -> > > > - else if (remote_ent_type == MEDIA_ENT_T_V4L2_SUBDEV) +> > > > - else if (remote_ent_type = MEDIA_ENT_T_V4L2_SUBDEV) > > > > + else if (is_media_entity_v4l2_subdev(remote->entity)) > > > > atomic_set(&fimc->out_path, FIMC_IO_ISP); > > > > else @@ -133,7 +133,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > break; > > > > } > > > > -> > > > - if (pad == NULL || +> > > > - if (pad = NULL || > > > > - media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) > > > > break; @@ -165,7 +165,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > media_entity_graph_walk_start(&graph, entity); > > > > > > > > while ((entity = media_entity_graph_walk_next(&graph))) { -> > > > - if (media_entity_type(entity) == MEDIA_ENT_T_DEVNODE) +> > > > - if (media_entity_type(entity) = MEDIA_ENT_T_DEVNODE) > > > > + if (is_media_entity_v4l2_io(entity)) > > > > use += entity->use_count; > > > > } @@ -174,11 +174,11 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > struct v4l2_subdev *subdev; > > > > int ret; > > > > -> > > > - subdev = media_entity_type(entity) == MEDIA_ENT_T_V4L2_SUBDEV +> > > > - subdev = media_entity_type(entity) = MEDIA_ENT_T_V4L2_SUBDEV > > > > + subdev = is_media_entity_v4l2_subdev(entity) > > > > ? media_entity_to_v4l2_subdev(entity) : NULL; > > > > -> > > > if (entity->use_count == 0 && change > 0 && subdev != NULL) { +> > > > if (entity->use_count = 0 && change > 0 && subdev != NULL) { > > > > @@ -754,7 +754,7 @@ static int isp_pipeline_pm_power(struct media_entity *entity, int change) > > > > media_entity_graph_walk_start(&graph, entity); > > > > @@ -201,7 +201,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > break; > > > > > > > > pad = media_entity_remote_pad(pad); -> > > > - if (pad == NULL || +> > > > - if (pad = NULL || > > > > - media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) > > > > break; @@ -211,7 +211,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > break; > > > > > > > > pad = media_entity_remote_pad(pad); -> > > > - if (pad == NULL || +> > > > - if (pad = NULL || > > > > - media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) > > > > break; @@ -225,14 +225,14 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > > > > > remote = media_entity_remote_pad(&video->pad); > > > > -> > > > - if (remote == NULL || +> > > > - if (remote = NULL || > > > > - media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!remote || !is_media_entity_v4l2_subdev(remote->entity)) > > > > return NULL; > > > > > > > > if (pad) > > > > @@ -243,7 +242,7 @@ static int isp_video_get_graph_data(struct isp_video *video, -> > > > if (entity == &video->video.entity) +> > > > if (entity = &video->video.entity) > > > > continue; > > > > > > > > - if (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE) @@ -270,7 +270,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > struct media_pad *remote; > > > > > > > > remote = media_entity_remote_pad(local); -> > > > - if (remote == NULL || +> > > > - if (remote = NULL || > > > > - media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!remote || !is_media_entity_v4l2_subdev(remote->entity)) > > > > return NULL; @@ -311,7 +311,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > struct media_pad *remote; > > > > > > > > remote = media_entity_remote_pad(local); -> > > > - if (remote == NULL || +> > > > - if (remote = NULL || > > > > - media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!remote || !is_media_entity_v4l2_subdev(remote->entity)) > > > > return NULL; @@ -321,7 +321,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > break; > > > > > > > > pad = media_entity_remote_pad(pad); -> > > > - if (pad == NULL || +> > > > - if (pad = NULL || > > > > - media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) > > > > break; @@ -335,10 +335,9 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > v4l2_subdev_link_validate_get_format(struct media_pad *pad, > > > > struct v4l2_subdev_format *fmt) > > > > { -> > > > - if (media_entity_type(pad->entity) == MEDIA_ENT_T_V4L2_SUBDEV) { +> > > > - if (media_entity_type(pad->entity) = MEDIA_ENT_T_V4L2_SUBDEV) { > > > > + if (is_media_entity_v4l2_subdev(pad->entity)) { -> > > > struct v4l2_subdev *sd = -> > > > media_entity_to_v4l2_subdev(pad->entity); +> > > > struct v4l2_subdev *sd > > > > media_entity_to_v4l2_subdev(pad->entity); > > > > > > > > diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c > > > > index 92573fa852a9..16763e0831f2 100644 @@ -346,18 +345,18 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c > > > > @@ -148,7 +148,7 @@ static void vpfe_prepare_pipeline(struct vpfe_video_device *video) > > > > while ((entity = media_entity_graph_walk_next(&graph))) { -> > > > if (entity == &video->video_dev.entity) +> > > > if (entity = &video->video_dev.entity) > > > > continue; > > > > - if (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE) > > > > + if ((!is_media_entity_v4l2_io(remote->entity)) > > > > continue; > > > > far_end = to_vpfe_video(media_entity_to_video_device(entity)); -> > > > if (far_end->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) +> > > > if (far_end->type = V4L2_BUF_TYPE_VIDEO_OUTPUT) > > > > @@ -293,7 +293,7 @@ static int vpfe_pipeline_enable(struct vpfe_pipeline *pipe) > > > > media_entity_graph_walk_start(&graph, entity); > > > > while ((entity = media_entity_graph_walk_next(&graph))) { > > > > -> > > > - if (media_entity_type(entity) == MEDIA_ENT_T_DEVNODE) +> > > > - if (media_entity_type(entity) = MEDIA_ENT_T_DEVNODE) > > > > + if !is_media_entity_v4l2_subdev(entity)) > > > > continue; > > > > subdev = media_entity_to_v4l2_subdev(entity); @@ -366,7 +365,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > > > > > while ((entity = media_entity_graph_walk_next(&graph))) { > > > > -> > > > - if (media_entity_type(entity) == MEDIA_ENT_T_DEVNODE) +> > > > - if (media_entity_type(entity) = MEDIA_ENT_T_DEVNODE) > > > > + if (!is_media_entity_v4l2_subdev(entity)) > > > > continue; > > > > subdev = media_entity_to_v4l2_subdev(entity); @@ -379,7 +378,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > media_entity_graph_walk_start(&graph, entity); > > > > > > > > while ((entity = media_entity_graph_walk_next(&graph))) { -> > > > - if (media_entity_type(entity) == MEDIA_ENT_T_DEVNODE) +> > > > - if (media_entity_type(entity) = MEDIA_ENT_T_DEVNODE) > > > > + if (is_media_entity_v4l2_io(entity)) > > > > use += entity->use_count; > > > > } @@ -388,11 +387,11 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > { > > > > struct v4l2_subdev *subdev; > > > > -> > > > - subdev = media_entity_type(entity) == MEDIA_ENT_T_V4L2_SUBDEV +> > > > - subdev = media_entity_type(entity) = MEDIA_ENT_T_V4L2_SUBDEV > > > > + subdev = is_media_entity_v4l2_subdev(entity) > > > > ? media_entity_to_v4l2_subdev(entity) : NULL; > > > > -> > > > if (entity->use_count == 0 && change > 0 && subdev != NULL) { +> > > > if (entity->use_count = 0 && change > 0 && subdev != NULL) { > > > > @@ -461,7 +461,7 @@ static int iss_pipeline_pm_power(struct media_entity *entity, int change) > > > > media_entity_graph_walk_start(&graph, entity); > > > > @@ -415,7 +414,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > break; > > > > > > > > pad = media_entity_remote_pad(pad); -> > > > - if (pad == NULL || +> > > > - if (pad = NULL || > > > > - media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) > > > > break; @@ -425,7 +424,7 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > break; > > > > > > > > pad = media_entity_remote_pad(pad); -> > > > - if (pad == NULL || +> > > > - if (pad = NULL || > > > > - media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) > > > > break; @@ -439,14 +438,14 @@ Sakari Ailus <sakari.ailus@iki.fi> escreveu: > > > > > > > > remote = media_entity_remote_pad(&video->pad); > > > > -> > > > - if (remote == NULL || +> > > > - if (remote = NULL || > > > > - media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV) > > > > + if (!remote || !is_media_entity_v4l2_subdev(remote->entity)) > > > > return NULL; > > > > > > > > if (pad) > > > > @@ -217,7 +216,7 @@ iss_video_far_end(struct iss_video *video) -> > > > if (entity == &video->video.entity) +> > > > if (entity = &video->video.entity) > > > > continue; > > > > > > > > - if (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE) diff --git a/a/content_digest b/N1/content_digest index 55e5adc..a6b8661 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,28 +5,8 @@ "ref\020151012153504.GL26916@valkosipuli.retiisi.org.uk\0" "From\0Mauro Carvalho Chehab <mchehab@osg.samsung.com>\0" "Subject\0Re: [PATCH v8 32/55] [media] media: use macros to check for V4L2 subdev entities\0" - "Date\0Mon, 12 Oct 2015 13:00:13 -0300\0" - "To\0Sakari Ailus <sakari.ailus@iki.fi>\0" - "Cc\0Linux Media Mailing List <linux-media@vger.kernel.org>" - Mauro Carvalho Chehab <mchehab@infradead.org> - Kyungmin Park <kyungmin.park@samsung.com> - Sylwester Nawrocki <s.nawrocki@samsung.com> - Kukjin Kim <kgene@kernel.org> - Krzysztof Kozlowski <k.kozlowski@samsung.com> - Laurent Pinchart <laurent.pinchart@ideasonboard.com> - Hyun Kwon <hyun.kwon@xilinx.com> - Michal Simek <michal.simek@xilinx.com> - " S\303\266ren Brinkmann <soren.brinkmann@xilinx.com>" - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - Hans Verkuil <hans.verkuil@cisco.com> - Prabhakar Lad <prabhakar.csengg@gmail.com> - Lars-Peter Clausen <lars@metafoo.de> - Markus Elfring <elfring@users.sourceforge.net> - Sakari Ailus <sakari.ailus@linux.intel.com> - Javier Martinez Canillas <javier@osg.samsung.com> - linux-arm-kernel@lists.infradead.org - linux-samsung-soc@vger.kernel.org - " linux-sh@vger.kernel.org\0" + "Date\0Mon, 12 Oct 2015 16:00:13 +0000\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Em Mon, 12 Oct 2015 18:35:05 +0300\n" @@ -64,7 +44,7 @@ "> > > > \twhile (pad->flags & MEDIA_PAD_FL_SINK) {\n" "> > > > \t\t/* source pad */\n" "> > > > \t\tpad = media_entity_remote_pad(pad);\n" - "> > > > -\t\tif (pad == NULL ||\n" + "> > > > -\t\tif (pad = NULL ||\n" "> > > > -\t\t media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\t\tif (!pad || !is_media_entity_v4l2_subdev(pad->entity))\n" "> > > > \t\t\tbreak;\n" @@ -78,7 +58,7 @@ "> > > > \t\t\t}\n" "> > > > \t\t}\n" "> > > > \n" - "> > > > -\t\tif (src_pad == NULL ||\n" + "> > > > -\t\tif (src_pad = NULL ||\n" "> > > > -\t\t media_entity_type(src_pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\t\tif (!src_pad || !is_media_entity_v4l2_subdev(src_pad->entity))\n" "> > > > \t\t\tbreak;\n" @@ -92,7 +72,7 @@ "> > > > +\tif (!is_media_entity_v4l2_subdev(remote->entity))\n" "> > > > \t\treturn -EINVAL;\n" "> > > > \n" - "> > > > \tif (WARN_ON(fimc == NULL))\n" + "> > > > \tif (WARN_ON(fimc = NULL))\n" "> > > > diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c\n" "> > > > index 3d9ccbf5f10f..5fbaf5e39903 100644\n" "> > > > --- a/drivers/media/platform/exynos4-is/fimc-isp-video.c\n" @@ -101,7 +81,7 @@ "> > > > \n" "> > > > \t\t/* Retrieve format at the source pad */\n" "> > > > \t\tpad = media_entity_remote_pad(pad);\n" - "> > > > -\t\tif (pad == NULL ||\n" + "> > > > -\t\tif (pad = NULL ||\n" "> > > > -\t\t media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\t\tif (!pad || !is_media_entity_v4l2_subdev(pad->entity))\n" "> > > > \t\t\tbreak;\n" @@ -115,7 +95,7 @@ "> > > > \t\t}\n" "> > > > \t\t/* Retrieve format at the source pad */\n" "> > > > \t\tpad = media_entity_remote_pad(pad);\n" - "> > > > -\t\tif (pad == NULL ||\n" + "> > > > -\t\tif (pad = NULL ||\n" "> > > > -\t\t media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\t\tif (!pad || !is_media_entity_v4l2_subdev(pad->entity))\n" "> > > > \t\t\tbreak;\n" @@ -128,7 +108,7 @@ "> > > > -\tunsigned int remote_ent_type = media_entity_type(remote->entity);\n" "> > > > \tint ret = 0;\n" "> > > > \n" - "> > > > \tif (WARN_ON(fimc == NULL))\n" + "> > > > \tif (WARN_ON(fimc = NULL))\n" "> > > > @@ -1000,7 +998,7 @@ static int fimc_lite_link_setup(struct media_entity *entity,\n" "> > > > \n" "> > > > \tswitch (local->index) {\n" @@ -142,7 +122,7 @@ "> > > > \tcase FLITE_SD_PAD_SOURCE_DMA:\n" "> > > > \t\tif (!(flags & MEDIA_LNK_FL_ENABLED))\n" "> > > > \t\t\tatomic_set(&fimc->out_path, FIMC_IO_NONE);\n" - "> > > > -\t\telse if (remote_ent_type == MEDIA_ENT_T_DEVNODE)\n" + "> > > > -\t\telse if (remote_ent_type = MEDIA_ENT_T_DEVNODE)\n" "> > > > +\t\telse if (is_media_entity_v4l2_io(remote->entity))\n" "> > > > \t\t\tatomic_set(&fimc->out_path, FIMC_IO_DMA);\n" "> > > > \t\telse\n" @@ -151,7 +131,7 @@ "> > > > \tcase FLITE_SD_PAD_SOURCE_ISP:\n" "> > > > \t\tif (!(flags & MEDIA_LNK_FL_ENABLED))\n" "> > > > \t\t\tatomic_set(&fimc->out_path, FIMC_IO_NONE);\n" - "> > > > -\t\telse if (remote_ent_type == MEDIA_ENT_T_V4L2_SUBDEV)\n" + "> > > > -\t\telse if (remote_ent_type = MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\t\telse if (is_media_entity_v4l2_subdev(remote->entity))\n" "> > > > \t\t\tatomic_set(&fimc->out_path, FIMC_IO_ISP);\n" "> > > > \t\telse\n" @@ -164,7 +144,7 @@ "> > > > \t\t\t\tbreak;\n" "> > > > \t\t}\n" "> > > > \n" - "> > > > -\t\tif (pad == NULL ||\n" + "> > > > -\t\tif (pad = NULL ||\n" "> > > > -\t\t media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\t\tif (!pad || !is_media_entity_v4l2_subdev(pad->entity))\n" "> > > > \t\t\tbreak;\n" @@ -196,7 +176,7 @@ "> > > > \tmedia_entity_graph_walk_start(&graph, entity);\n" "> > > > \n" "> > > > \twhile ((entity = media_entity_graph_walk_next(&graph))) {\n" - "> > > > -\t\tif (media_entity_type(entity) == MEDIA_ENT_T_DEVNODE)\n" + "> > > > -\t\tif (media_entity_type(entity) = MEDIA_ENT_T_DEVNODE)\n" "> > > > +\t\tif (is_media_entity_v4l2_io(entity))\n" "> > > > \t\t\tuse += entity->use_count;\n" "> > > > \t}\n" @@ -205,11 +185,11 @@ "> > > > \tstruct v4l2_subdev *subdev;\n" "> > > > \tint ret;\n" "> > > > \n" - "> > > > -\tsubdev = media_entity_type(entity) == MEDIA_ENT_T_V4L2_SUBDEV\n" + "> > > > -\tsubdev = media_entity_type(entity) = MEDIA_ENT_T_V4L2_SUBDEV\n" "> > > > +\tsubdev = is_media_entity_v4l2_subdev(entity)\n" "> > > > \t ? media_entity_to_v4l2_subdev(entity) : NULL;\n" "> > > > \n" - "> > > > \tif (entity->use_count == 0 && change > 0 && subdev != NULL) {\n" + "> > > > \tif (entity->use_count = 0 && change > 0 && subdev != NULL) {\n" "> > > > @@ -754,7 +754,7 @@ static int isp_pipeline_pm_power(struct media_entity *entity, int change)\n" "> > > > \tmedia_entity_graph_walk_start(&graph, entity);\n" "> > > > \n" @@ -232,7 +212,7 @@ "> > > > \t\t\tbreak;\n" "> > > > \n" "> > > > \t\tpad = media_entity_remote_pad(pad);\n" - "> > > > -\t\tif (pad == NULL ||\n" + "> > > > -\t\tif (pad = NULL ||\n" "> > > > -\t\t media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\t\tif (!pad || !is_media_entity_v4l2_subdev(pad->entity))\n" "> > > > \t\t\tbreak;\n" @@ -242,7 +222,7 @@ "> > > > \t\t\tbreak;\n" "> > > > \n" "> > > > \t\tpad = media_entity_remote_pad(pad);\n" - "> > > > -\t\tif (pad == NULL ||\n" + "> > > > -\t\tif (pad = NULL ||\n" "> > > > -\t\t media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\t\tif (!pad || !is_media_entity_v4l2_subdev(pad->entity))\n" "> > > > \t\t\tbreak;\n" @@ -256,14 +236,14 @@ "> > > > \n" "> > > > \tremote = media_entity_remote_pad(&video->pad);\n" "> > > > \n" - "> > > > -\tif (remote == NULL ||\n" + "> > > > -\tif (remote = NULL ||\n" "> > > > -\t media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\tif (!remote || !is_media_entity_v4l2_subdev(remote->entity))\n" "> > > > \t\treturn NULL;\n" "> > > > \n" "> > > > \tif (pad)\n" "> > > > @@ -243,7 +242,7 @@ static int isp_video_get_graph_data(struct isp_video *video,\n" - "> > > > \t\tif (entity == &video->video.entity)\n" + "> > > > \t\tif (entity = &video->video.entity)\n" "> > > > \t\t\tcontinue;\n" "> > > > \n" "> > > > -\t\tif (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE)\n" @@ -301,7 +281,7 @@ "> > > > \tstruct media_pad *remote;\n" "> > > > \n" "> > > > \tremote = media_entity_remote_pad(local);\n" - "> > > > -\tif (remote == NULL ||\n" + "> > > > -\tif (remote = NULL ||\n" "> > > > -\t media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\tif (!remote || !is_media_entity_v4l2_subdev(remote->entity))\n" "> > > > \t\treturn NULL;\n" @@ -342,7 +322,7 @@ "> > > > \tstruct media_pad *remote;\n" "> > > > \n" "> > > > \tremote = media_entity_remote_pad(local);\n" - "> > > > -\tif (remote == NULL ||\n" + "> > > > -\tif (remote = NULL ||\n" "> > > > -\t media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\tif (!remote || !is_media_entity_v4l2_subdev(remote->entity))\n" "> > > > \t\treturn NULL;\n" @@ -352,7 +332,7 @@ "> > > > \t\t\tbreak;\n" "> > > > \n" "> > > > \t\tpad = media_entity_remote_pad(pad);\n" - "> > > > -\t\tif (pad == NULL ||\n" + "> > > > -\t\tif (pad = NULL ||\n" "> > > > -\t\t media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\t\tif (!pad || !is_media_entity_v4l2_subdev(pad->entity))\n" "> > > > \t\t\tbreak;\n" @@ -366,10 +346,9 @@ "> > > > v4l2_subdev_link_validate_get_format(struct media_pad *pad,\n" "> > > > \t\t\t\t struct v4l2_subdev_format *fmt)\n" "> > > > {\n" - "> > > > -\tif (media_entity_type(pad->entity) == MEDIA_ENT_T_V4L2_SUBDEV) {\n" + "> > > > -\tif (media_entity_type(pad->entity) = MEDIA_ENT_T_V4L2_SUBDEV) {\n" "> > > > +\tif (is_media_entity_v4l2_subdev(pad->entity)) {\n" - "> > > > \t\tstruct v4l2_subdev *sd =\n" - "> > > > \t\t\tmedia_entity_to_v4l2_subdev(pad->entity);\n" + "> > > > \t\tstruct v4l2_subdev *sd > > > > \t\t\tmedia_entity_to_v4l2_subdev(pad->entity);\n" "> > > > \n" "> > > > diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c\n" "> > > > index 92573fa852a9..16763e0831f2 100644\n" @@ -377,18 +356,18 @@ "> > > > +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c\n" "> > > > @@ -148,7 +148,7 @@ static void vpfe_prepare_pipeline(struct vpfe_video_device *video)\n" "> > > > \twhile ((entity = media_entity_graph_walk_next(&graph))) {\n" - "> > > > \t\tif (entity == &video->video_dev.entity)\n" + "> > > > \t\tif (entity = &video->video_dev.entity)\n" "> > > > \t\t\tcontinue;\n" "> > > > -\t\tif (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE)\n" "> > > > +\t\tif ((!is_media_entity_v4l2_io(remote->entity))\n" "> > > > \t\t\tcontinue;\n" "> > > > \t\tfar_end = to_vpfe_video(media_entity_to_video_device(entity));\n" - "> > > > \t\tif (far_end->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)\n" + "> > > > \t\tif (far_end->type = V4L2_BUF_TYPE_VIDEO_OUTPUT)\n" "> > > > @@ -293,7 +293,7 @@ static int vpfe_pipeline_enable(struct vpfe_pipeline *pipe)\n" "> > > > \tmedia_entity_graph_walk_start(&graph, entity);\n" "> > > > \twhile ((entity = media_entity_graph_walk_next(&graph))) {\n" "> > > > \n" - "> > > > -\t\tif (media_entity_type(entity) == MEDIA_ENT_T_DEVNODE)\n" + "> > > > -\t\tif (media_entity_type(entity) = MEDIA_ENT_T_DEVNODE)\n" "> > > > +\t\tif !is_media_entity_v4l2_subdev(entity))\n" "> > > > \t\t\tcontinue;\n" "> > > > \t\tsubdev = media_entity_to_v4l2_subdev(entity);\n" @@ -397,7 +376,7 @@ "> > > > \n" "> > > > \twhile ((entity = media_entity_graph_walk_next(&graph))) {\n" "> > > > \n" - "> > > > -\t\tif (media_entity_type(entity) == MEDIA_ENT_T_DEVNODE)\n" + "> > > > -\t\tif (media_entity_type(entity) = MEDIA_ENT_T_DEVNODE)\n" "> > > > +\t\tif (!is_media_entity_v4l2_subdev(entity))\n" "> > > > \t\t\tcontinue;\n" "> > > > \t\tsubdev = media_entity_to_v4l2_subdev(entity);\n" @@ -410,7 +389,7 @@ "> > > > \tmedia_entity_graph_walk_start(&graph, entity);\n" "> > > > \n" "> > > > \twhile ((entity = media_entity_graph_walk_next(&graph))) {\n" - "> > > > -\t\tif (media_entity_type(entity) == MEDIA_ENT_T_DEVNODE)\n" + "> > > > -\t\tif (media_entity_type(entity) = MEDIA_ENT_T_DEVNODE)\n" "> > > > +\t\tif (is_media_entity_v4l2_io(entity))\n" "> > > > \t\t\tuse += entity->use_count;\n" "> > > > \t}\n" @@ -419,11 +398,11 @@ "> > > > {\n" "> > > > \tstruct v4l2_subdev *subdev;\n" "> > > > \n" - "> > > > -\tsubdev = media_entity_type(entity) == MEDIA_ENT_T_V4L2_SUBDEV\n" + "> > > > -\tsubdev = media_entity_type(entity) = MEDIA_ENT_T_V4L2_SUBDEV\n" "> > > > +\tsubdev = is_media_entity_v4l2_subdev(entity)\n" "> > > > \t ? media_entity_to_v4l2_subdev(entity) : NULL;\n" "> > > > \n" - "> > > > \tif (entity->use_count == 0 && change > 0 && subdev != NULL) {\n" + "> > > > \tif (entity->use_count = 0 && change > 0 && subdev != NULL) {\n" "> > > > @@ -461,7 +461,7 @@ static int iss_pipeline_pm_power(struct media_entity *entity, int change)\n" "> > > > \tmedia_entity_graph_walk_start(&graph, entity);\n" "> > > > \n" @@ -446,7 +425,7 @@ "> > > > \t\t\tbreak;\n" "> > > > \n" "> > > > \t\tpad = media_entity_remote_pad(pad);\n" - "> > > > -\t\tif (pad == NULL ||\n" + "> > > > -\t\tif (pad = NULL ||\n" "> > > > -\t\t media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\t\tif (!pad || !is_media_entity_v4l2_subdev(pad->entity))\n" "> > > > \t\t\tbreak;\n" @@ -456,7 +435,7 @@ "> > > > \t\t\tbreak;\n" "> > > > \n" "> > > > \t\tpad = media_entity_remote_pad(pad);\n" - "> > > > -\t\tif (pad == NULL ||\n" + "> > > > -\t\tif (pad = NULL ||\n" "> > > > -\t\t media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\t\tif (!pad || !is_media_entity_v4l2_subdev(pad->entity))\n" "> > > > \t\t\tbreak;\n" @@ -470,14 +449,14 @@ "> > > > \n" "> > > > \tremote = media_entity_remote_pad(&video->pad);\n" "> > > > \n" - "> > > > -\tif (remote == NULL ||\n" + "> > > > -\tif (remote = NULL ||\n" "> > > > -\t media_entity_type(remote->entity) != MEDIA_ENT_T_V4L2_SUBDEV)\n" "> > > > +\tif (!remote || !is_media_entity_v4l2_subdev(remote->entity))\n" "> > > > \t\treturn NULL;\n" "> > > > \n" "> > > > \tif (pad)\n" "> > > > @@ -217,7 +216,7 @@ iss_video_far_end(struct iss_video *video)\n" - "> > > > \t\tif (entity == &video->video.entity)\n" + "> > > > \t\tif (entity = &video->video.entity)\n" "> > > > \t\t\tcontinue;\n" "> > > > \n" "> > > > -\t\tif (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE)\n" @@ -515,4 +494,4 @@ "\n" Mauro -f9124747ae3386979433aaba0f5ea7ce81ed8354eb106f3587e447315080d6cf +eef8a52e7d7858affb98d346734a1bc90ffa8afd31eb1b5d6cfdea946a89288f
diff --git a/a/content_digest b/N2/content_digest index 55e5adc..21efc06 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,30 +3,10 @@ "ref\020151011210752.GK26916@valkosipuli.retiisi.org.uk\0" "ref\020151011215625.779630d9@recife.lan\0" "ref\020151012153504.GL26916@valkosipuli.retiisi.org.uk\0" - "From\0Mauro Carvalho Chehab <mchehab@osg.samsung.com>\0" - "Subject\0Re: [PATCH v8 32/55] [media] media: use macros to check for V4L2 subdev entities\0" + "From\0mchehab@osg.samsung.com (Mauro Carvalho Chehab)\0" + "Subject\0[PATCH v8 32/55] [media] media: use macros to check for V4L2 subdev entities\0" "Date\0Mon, 12 Oct 2015 13:00:13 -0300\0" - "To\0Sakari Ailus <sakari.ailus@iki.fi>\0" - "Cc\0Linux Media Mailing List <linux-media@vger.kernel.org>" - Mauro Carvalho Chehab <mchehab@infradead.org> - Kyungmin Park <kyungmin.park@samsung.com> - Sylwester Nawrocki <s.nawrocki@samsung.com> - Kukjin Kim <kgene@kernel.org> - Krzysztof Kozlowski <k.kozlowski@samsung.com> - Laurent Pinchart <laurent.pinchart@ideasonboard.com> - Hyun Kwon <hyun.kwon@xilinx.com> - Michal Simek <michal.simek@xilinx.com> - " S\303\266ren Brinkmann <soren.brinkmann@xilinx.com>" - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - Hans Verkuil <hans.verkuil@cisco.com> - Prabhakar Lad <prabhakar.csengg@gmail.com> - Lars-Peter Clausen <lars@metafoo.de> - Markus Elfring <elfring@users.sourceforge.net> - Sakari Ailus <sakari.ailus@linux.intel.com> - Javier Martinez Canillas <javier@osg.samsung.com> - linux-arm-kernel@lists.infradead.org - linux-samsung-soc@vger.kernel.org - " linux-sh@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Em Mon, 12 Oct 2015 18:35:05 +0300\n" @@ -515,4 +495,4 @@ "\n" Mauro -f9124747ae3386979433aaba0f5ea7ce81ed8354eb106f3587e447315080d6cf +a872aa5db83125ecafa29151a0ed9e307713e3213d1e37783092e8dc856293bc
diff --git a/a/content_digest b/N3/content_digest index 55e5adc..2856470 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -26,7 +26,8 @@ Javier Martinez Canillas <javier@osg.samsung.com> linux-arm-kernel@lists.infradead.org linux-samsung-soc@vger.kernel.org - " linux-sh@vger.kernel.org\0" + linux-sh@vger.kernel.org + " devel@driverdev.osuosl.org\0" "\00:1\0" "b\0" "Em Mon, 12 Oct 2015 18:35:05 +0300\n" @@ -515,4 +516,4 @@ "\n" Mauro -f9124747ae3386979433aaba0f5ea7ce81ed8354eb106f3587e447315080d6cf +235af62bce670c25b2774824d5e26a4d3b84ca398018b2080fb1e6b4a6679724
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.