media: aspeed: Rework memory mapping in probe (aef0a509) · Commits · 戴 / test

Use the recently introduced function devm_platform_ioremap_resource to save a few lines of code. This makes the driver match common platform device probe patterns. Signed-off-by:

Joel Stanley <joel@jms.id.au> Reviewed-by:

Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> Reviewed-by:

Eddie James <eajames@linux.ibm.com> Signed-off-by:

Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by:

Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

drivers/media/platform/aspeed-video.c

+6 −10

Original line number	Diff line number	Diff line
		@@ -1655,14 +1655,17 @@ err_unprepare_eclk:

		static int aspeed_video_probe(struct platform_device *pdev)
		{
		struct aspeed_video *video;
		int rc;
		struct resource *res;
		struct aspeed_video *video =
		devm_kzalloc(&pdev->dev, sizeof(*video), GFP_KERNEL);

		video = devm_kzalloc(&pdev->dev, sizeof(*video), GFP_KERNEL);
		if (!video)
		return -ENOMEM;

		video->base = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(video->base))
		return PTR_ERR(video->base);

		video->frame_rate = 30;
		video->dev = &pdev->dev;
		spin_lock_init(&video->lock);
		@@ -1671,13 +1674,6 @@ static int aspeed_video_probe(struct platform_device *pdev)
		INIT_DELAYED_WORK(&video->res_work, aspeed_video_resolution_work);
		INIT_LIST_HEAD(&video->buffers);

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

		video->base = devm_ioremap_resource(video->dev, res);

		if (IS_ERR(video->base))
		return PTR_ERR(video->base);

		rc = aspeed_video_init(video);
		if (rc)
		return rc;

Admin message