diff for duplicates of <20151208140345.7d48c120@recife.lan> diff --git a/a/1.txt b/N1/1.txt index 31bf327..3cca1d6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > > media_entity *entity) 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; @@ -45,7 +45,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > > *fimc) } > > } > > -> > - 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; @@ -59,7 +59,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> 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 @@ -70,7 +70,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> 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; @@ -85,7 +85,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > > *fimc) } > > /* 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; @@ -98,7 +98,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> 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, > > @@ -113,7 +113,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > > *entity, 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 @@ -122,7 +122,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > > *entity, 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 @@ -136,7 +136,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> 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; @@ -171,7 +171,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > > *entity) 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; > > } @@ -180,11 +180,11 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > > *entity, int change) 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); > > @@ -208,7 +208,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > > *pipe, 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; @@ -218,7 +218,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > > *pipe) 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; @@ -234,14 +234,14 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> 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) +> > *video, if (entity = &video->video.entity) > > continue; > > > > - if (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE) @@ -282,7 +282,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > > *pad) 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; @@ -324,7 +324,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> 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; @@ -334,7 +334,7 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > > *pipe, bool start) 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; @@ -349,10 +349,9 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> 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 @@ -360,27 +359,26 @@ Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > > --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c > > +++ 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) +> > vpfe_video_device *video) while ((entity > > media_entity_graph_walk_next(&graph))) { +> > 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)) > > With these two chunks fixed, > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > -> I'm wondering, however, why you replace some occurrences of == +> I'm wondering, however, why you replace some occurrences of = > MEDIA_ENT_T_DEVNODE with !is_media_entity_v4l2_subdev and some other with > is_media_entity_v4l2_io. @@ -402,7 +400,7 @@ the above. > > > > 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); @@ -416,7 +414,7 @@ the above. > > *entity) 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; > > } @@ -425,11 +423,11 @@ the above. > > *entity, int change) { > > 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); > > @@ -453,7 +451,7 @@ the above. > > *pipe, 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; @@ -463,7 +461,7 @@ the above. > > *pipe, 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; @@ -479,14 +477,14 @@ the above. > > > > 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 f4b6184..2779e30 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,28 +3,8 @@ "ref\03216825.M3fFyKeUjZ@avalon\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\0Tue, 8 Dec 2015 14:03:45 -0200\0" - "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\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> - 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 - " devel@driverdev.osuosl.org\0" + "Date\0Tue, 08 Dec 2015 16:03:45 +0000\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Em Sun, 06 Dec 2015 04:16:15 +0200\n" @@ -59,7 +39,7 @@ "> > media_entity *entity) while (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" @@ -74,7 +54,7 @@ "> > *fimc) }\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" @@ -88,7 +68,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\n" "> > b/drivers/media/platform/exynos4-is/fimc-isp-video.c index\n" "> > 3d9ccbf5f10f..5fbaf5e39903 100644\n" @@ -99,7 +79,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" @@ -114,7 +94,7 @@ "> > *fimc) }\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" @@ -127,7 +107,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\n" "> > *entity,\n" "> > \n" @@ -142,7 +122,7 @@ "> > *entity, case 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 @@ "> > *entity, case 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" @@ -165,7 +145,7 @@ "> > break;\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" @@ -200,7 +180,7 @@ "> > *entity) media_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" @@ -209,11 +189,11 @@ "> > *entity, int change) struct 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\n" "> > *entity, int change) media_entity_graph_walk_start(&graph, entity);\n" "> > \n" @@ -237,7 +217,7 @@ "> > *pipe, break;\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" @@ -247,7 +227,7 @@ "> > *pipe) break;\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" @@ -263,14 +243,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\n" - "> > *video, if (entity == &video->video.entity)\n" + "> > *video, if (entity = &video->video.entity)\n" "> > \t\t\tcontinue;\n" "> > \n" "> > -\t\tif (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE)\n" @@ -311,7 +291,7 @@ "> > *pad) struct 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" @@ -353,7 +333,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" @@ -363,7 +343,7 @@ "> > *pipe, bool start) break;\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" @@ -378,10 +358,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\n" "> > b/drivers/staging/media/davinci_vpfe/vpfe_video.c index\n" @@ -389,27 +368,26 @@ "> > --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c\n" "> > +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c\n" "> > @@ -148,7 +148,7 @@ static void vpfe_prepare_pipeline(struct\n" - "> > vpfe_video_device *video) while ((entity =\n" - "> > media_entity_graph_walk_next(&graph))) {\n" - "> > \t\tif (entity == &video->video_dev.entity)\n" + "> > vpfe_video_device *video) while ((entity > > media_entity_graph_walk_next(&graph))) {\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\n" "> > *pipe) media_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" "> \n" "> With these two chunks fixed,\n" "> \n" "> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n" "> \n" - "> I'm wondering, however, why you replace some occurrences of == \n" + "> I'm wondering, however, why you replace some occurrences of = \n" "> MEDIA_ENT_T_DEVNODE with !is_media_entity_v4l2_subdev and some other with \n" "> is_media_entity_v4l2_io.\n" "\n" @@ -431,7 +409,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" @@ -445,7 +423,7 @@ "> > *entity) media_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" @@ -454,11 +432,11 @@ "> > *entity, int change) {\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\n" "> > *entity, int change) media_entity_graph_walk_start(&graph, entity);\n" "> > \n" @@ -482,7 +460,7 @@ "> > *pipe, break;\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" @@ -492,7 +470,7 @@ "> > *pipe, break;\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" @@ -508,14 +486,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" @@ -525,4 +503,4 @@ "> > \t\tfar_end = to_iss_video(media_entity_to_video_device(entity));\n" > -67f4b13e1f5f89cb4ebf781322e27ad113fd0ca7468de94921dd4a5d3f3ffa83 +b8c3b638bbe85017c691b282ecf79e854e142eb71a3d6fc6ce672a52d7307313
diff --git a/a/content_digest b/N2/content_digest index f4b6184..f3ec711 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,30 +1,10 @@ "ref\0cover.1440902901.git.mchehab@osg.samsung.com\0" "ref\0b94146f3b95e9adb08b11fffc896a9e747b2fa9c.1440902901.git.mchehab@osg.samsung.com\0" "ref\03216825.M3fFyKeUjZ@avalon\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\0Tue, 8 Dec 2015 14:03:45 -0200\0" - "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\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> - 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 - " devel@driverdev.osuosl.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Em Sun, 06 Dec 2015 04:16:15 +0200\n" @@ -525,4 +505,4 @@ "> > \t\tfar_end = to_iss_video(media_entity_to_video_device(entity));\n" > -67f4b13e1f5f89cb4ebf781322e27ad113fd0ca7468de94921dd4a5d3f3ffa83 +4567bd3a7029b3ce9326a3981d760304a92e6955567162ec0eeab62c5529686d
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.