From: Marek Szyprowski Date: Wed, 9 Nov 2016 14:24:01 +0000 (-0200) Subject: [media] exynos-gsc: Use of_device_get_match_data() helper X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aa7929f5954ce7232bdd9a5fe01d7458f95d104b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git [media] exynos-gsc: Use of_device_get_match_data() helper Replace open-coded driver data extraction code with generic helper. Signed-off-by: Marek Szyprowski Tested-by: Javier Martinez Canillas Signed-off-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c index c7693c6296bf..f0d8e2433299 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/drivers/media/platform/exynos-gsc/gsc-core.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "gsc-core.h" @@ -988,24 +989,12 @@ static const struct of_device_id exynos_gsc_match[] = { }; MODULE_DEVICE_TABLE(of, exynos_gsc_match); -static void *gsc_get_drv_data(struct platform_device *pdev) -{ - struct gsc_driverdata *driver_data = NULL; - const struct of_device_id *match; - - match = of_match_node(exynos_gsc_match, pdev->dev.of_node); - if (match) - driver_data = (struct gsc_driverdata *)match->data; - - return driver_data; -} - static int gsc_probe(struct platform_device *pdev) { struct gsc_dev *gsc; struct resource *res; - struct gsc_driverdata *drv_data = gsc_get_drv_data(pdev); struct device *dev = &pdev->dev; + const struct gsc_driverdata *drv_data = of_device_get_match_data(dev); int ret; gsc = devm_kzalloc(dev, sizeof(struct gsc_dev), GFP_KERNEL);