Commit 0f4afd52 authored by Rob Herring's avatar Rob Herring Committed by Hans Verkuil
Browse files

media: Use of_property_present() for testing DT property presence 



It is preferred to use typed property access functions (i.e.
of_property_read_<type> functions) rather than low-level
of_get_property/of_find_property functions for reading properties. As
part of this, convert of_get_property/of_find_property calls to the
recently added of_property_present() helper when we just want to test
for presence of a property and nothing more.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 567f97bd

drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1782,7 +1782,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev) 
	jpeg->vdev->device_caps = V4L2_CAP_STREAMING |

				  V4L2_CAP_VIDEO_M2M_MPLANE;



	if (of_get_property(pdev->dev.of_node, "dma-ranges", NULL))

	if (of_property_present(pdev->dev.of_node, "dma-ranges"))

		dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(34));



	ret = video_register_device(jpeg->vdev, VFL_TYPE_VIDEO, -1);

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) 
		}

	}



	if (of_get_property(pdev->dev.of_node, "dma-ranges", NULL)) {

	if (of_property_present(pdev->dev.of_node, "dma-ranges")) {

		ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(34));

		if (ret) {

			mtk_v4l2_err("Failed to set mask");

drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) 
		goto err_event_workq;

	}



	if (of_get_property(pdev->dev.of_node, "dma-ranges", NULL))

	if (of_property_present(pdev->dev.of_node, "dma-ranges"))

		dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(34));



	ret = video_register_device(vfd_enc, VFL_TYPE_VIDEO, -1);

drivers/media/platform/xilinx/xilinx-vtc.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ struct xvtc_device *xvtc_of_get(struct device_node *np) 
	struct xvtc_device *found = NULL;

	struct xvtc_device *xvtc;



	if (!of_find_property(np, "xlnx,vtc", NULL))

	if (!of_property_present(np, "xlnx,vtc"))

		return NULL;



	xvtc_node = of_parse_phandle(np, "xlnx,vtc", 0);