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

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

[media] exynos-gsc: remove non-device-tree init code 



Exynos platform 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 77401dd7

drivers/media/platform/exynos-gsc/gsc-core.c

+6 −27
Original line number Diff line number Diff line
@@ -967,15 +967,6 @@ static struct gsc_driverdata gsc_v_100_drvdata = { 
	.lclk_frequency = 266000000UL,

};



static const struct platform_device_id gsc_driver_ids[] = {

	{

		.name		= "exynos-gsc",

		.driver_data	= (unsigned long)&gsc_v_100_drvdata,

	},

	{},

};

MODULE_DEVICE_TABLE(platform, gsc_driver_ids);



static const struct of_device_id exynos_gsc_match[] = {

	{

		.compatible = "samsung,exynos5-gsc",
@@ -988,17 +979,11 @@ MODULE_DEVICE_TABLE(of, exynos_gsc_match); 
static void *gsc_get_drv_data(struct platform_device *pdev)

{

	struct gsc_driverdata *driver_data = NULL;



	if (pdev->dev.of_node) {

	const struct of_device_id *match;

		match = of_match_node(exynos_gsc_match,

					pdev->dev.of_node);



	match = of_match_node(exynos_gsc_match, pdev->dev.of_node);

	if (match)

		driver_data = (struct gsc_driverdata *)match->data;

	} else {

		driver_data = (struct gsc_driverdata *)

			platform_get_device_id(pdev)->driver_data;

	}



	return driver_data;

}
@@ -1084,19 +1069,14 @@ static int gsc_probe(struct platform_device *pdev) 
	if (!gsc)

		return -ENOMEM;



	if (dev->of_node)

	gsc->id = of_alias_get_id(pdev->dev.of_node, "gsc");

	else

		gsc->id = pdev->id;



	if (gsc->id >= drv_data->num_entities) {

	if (gsc->id >= drv_data->num_entities || gsc->id < 0) {

		dev_err(dev, "Invalid platform device id: %d\n", gsc->id);

		return -EINVAL;

	}



	gsc->variant = drv_data->variant[gsc->id];

	gsc->pdev = pdev;

	gsc->pdata = dev->platform_data;



	init_waitqueue_head(&gsc->irq_queue);

	spin_lock_init(&gsc->slock);
@@ -1253,7 +1233,6 @@ static const struct dev_pm_ops gsc_pm_ops = { 
static struct platform_driver gsc_driver = {

	.probe		= gsc_probe,

	.remove		= gsc_remove,

	.id_table	= gsc_driver_ids,

	.driver = {

		.name	= GSC_MODULE_NAME,

		.pm	= &gsc_pm_ops,

drivers/media/platform/exynos-gsc/gsc-core.h

+0 −1
Original line number Diff line number Diff line
@@ -340,7 +340,6 @@ struct gsc_dev { 
	void __iomem			*regs;

	wait_queue_head_t		irq_queue;

	struct gsc_m2m_device		m2m;

	struct exynos_platform_gscaler	*pdata;

	unsigned long			state;

	struct vb2_alloc_ctx		*alloc_ctx;

	struct video_device		vdev;