Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef3617c4 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-g2d: remove non-device-tree init code 



Exynos and Samsung S5P platforms has been fully converted to device
tree, so old platform device based init data can be now removed.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c1ac0571

drivers/media/platform/s5p-g2d/g2d.c

+5 −22
Original line number Diff line number Diff line
@@ -719,16 +719,12 @@ static int g2d_probe(struct platform_device *pdev) 


	def_frame.stride = (def_frame.width * def_frame.fmt->depth) >> 3;



	if (!pdev->dev.of_node) {

		dev->variant = g2d_get_drv_data(pdev);

	} else {

	of_id = of_match_node(exynos_g2d_match, pdev->dev.of_node);

	if (!of_id) {

		ret = -ENODEV;

		goto unreg_video_dev;

	}

	dev->variant = (struct g2d_variant *)of_id->data;

	}



	return 0;
@@ -788,22 +784,9 @@ static const struct of_device_id exynos_g2d_match[] = { 
};

MODULE_DEVICE_TABLE(of, exynos_g2d_match);



static const struct platform_device_id g2d_driver_ids[] = {

	{

		.name = "s5p-g2d",

		.driver_data = (unsigned long)&g2d_drvdata_v3x,

	}, {

		.name = "s5p-g2d-v4x",

		.driver_data = (unsigned long)&g2d_drvdata_v4x,

	},

	{},

};

MODULE_DEVICE_TABLE(platform, g2d_driver_ids);



static struct platform_driver g2d_pdrv = {

	.probe		= g2d_probe,

	.remove		= g2d_remove,

	.id_table	= g2d_driver_ids,

	.driver		= {

		.name = G2D_NAME,

		.of_match_table = exynos_g2d_match,

drivers/media/platform/s5p-g2d/g2d.h

+0 −5
Original line number Diff line number Diff line
@@ -89,8 +89,3 @@ void g2d_set_flip(struct g2d_dev *d, u32 r); 
void g2d_set_v41_stretch(struct g2d_dev *d,

			struct g2d_frame *src, struct g2d_frame *dst);

void g2d_set_cmd(struct g2d_dev *d, u32 c);
 


static inline struct g2d_variant *g2d_get_drv_data(struct platform_device *pdev)

{

	return (struct g2d_variant *)platform_get_device_id(pdev)->driver_data;

}