From: Eric Anholt <eric@anholt.net> To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, David Airlie <airlied@linux.ie>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Inki Dae <inki.dae@samsung.com>, Joonyoung Shim <jy0922.shim@samsung.com>, Seung-Woo Kim <sw0312.kim@samsung.com>, Kyungmin Park <kyungmin.park@samsung.com>, Eric Anholt <eric@anholt.net> Subject: [PATCH 2/2] drm/exynos: Use the core platform_driver component matching helper. Date: Mon, 28 Sep 2015 16:54:09 -0700 [thread overview] Message-ID: <1443484449-31868-2-git-send-email-eric@anholt.net> (raw) In-Reply-To: <1443484449-31868-1-git-send-email-eric@anholt.net> Signed-off-by: Eric Anholt <eric@anholt.net> --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 37 +++++++-------------------------- 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 831d2e4..74826ec 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -566,32 +566,6 @@ static struct platform_driver *const exynos_drm_drv_with_simple_dev[] = { }; #define PDEV_COUNT ARRAY_SIZE(exynos_drm_drv_with_simple_dev) -static int compare_dev(struct device *dev, void *data) -{ - return dev == (struct device *)data; -} - -static struct component_match *exynos_drm_match_add(struct device *dev) -{ - struct component_match *match = NULL; - int i; - - for (i = 0; i < ARRAY_SIZE(exynos_drm_kms_drivers); ++i) { - struct device_driver *drv = &exynos_drm_kms_drivers[i]->driver; - struct device *p = NULL, *d; - - while ((d = bus_find_device(&platform_bus_type, p, drv, - (void *)platform_bus_type.match))) { - put_device(p); - component_match_add(dev, &match, compare_dev, d); - p = d; - } - put_device(p); - } - - return match ?: ERR_PTR(-ENODEV); -} - static int exynos_drm_bind(struct device *dev) { return drm_platform_init(&exynos_drm_driver, to_platform_device(dev)); @@ -609,14 +583,17 @@ static const struct component_master_ops exynos_drm_ops = { static int exynos_drm_platform_probe(struct platform_device *pdev) { - struct component_match *match; + struct component_match *match = NULL; pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); exynos_drm_driver.num_ioctls = ARRAY_SIZE(exynos_ioctls); - match = exynos_drm_match_add(&pdev->dev); - if (IS_ERR(match)) - return PTR_ERR(match); + component_match_add_platform_drivers(&pdev->dev, &match, + exynos_drm_kms_drivers, + ARRAY_SIZE(exynos_drm_kms_drivers)); + + if (!match) + return -ENODEV; return component_master_add_with_match(&pdev->dev, &exynos_drm_ops, match); -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Eric Anholt <eric@anholt.net> To: dri-devel@lists.freedesktop.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Seung-Woo Kim <sw0312.kim@samsung.com>, linux-kernel@vger.kernel.org, Kyungmin Park <kyungmin.park@samsung.com> Subject: [PATCH 2/2] drm/exynos: Use the core platform_driver component matching helper. Date: Mon, 28 Sep 2015 16:54:09 -0700 [thread overview] Message-ID: <1443484449-31868-2-git-send-email-eric@anholt.net> (raw) In-Reply-To: <1443484449-31868-1-git-send-email-eric@anholt.net> Signed-off-by: Eric Anholt <eric@anholt.net> --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 37 +++++++-------------------------- 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 831d2e4..74826ec 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -566,32 +566,6 @@ static struct platform_driver *const exynos_drm_drv_with_simple_dev[] = { }; #define PDEV_COUNT ARRAY_SIZE(exynos_drm_drv_with_simple_dev) -static int compare_dev(struct device *dev, void *data) -{ - return dev == (struct device *)data; -} - -static struct component_match *exynos_drm_match_add(struct device *dev) -{ - struct component_match *match = NULL; - int i; - - for (i = 0; i < ARRAY_SIZE(exynos_drm_kms_drivers); ++i) { - struct device_driver *drv = &exynos_drm_kms_drivers[i]->driver; - struct device *p = NULL, *d; - - while ((d = bus_find_device(&platform_bus_type, p, drv, - (void *)platform_bus_type.match))) { - put_device(p); - component_match_add(dev, &match, compare_dev, d); - p = d; - } - put_device(p); - } - - return match ?: ERR_PTR(-ENODEV); -} - static int exynos_drm_bind(struct device *dev) { return drm_platform_init(&exynos_drm_driver, to_platform_device(dev)); @@ -609,14 +583,17 @@ static const struct component_master_ops exynos_drm_ops = { static int exynos_drm_platform_probe(struct platform_device *pdev) { - struct component_match *match; + struct component_match *match = NULL; pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); exynos_drm_driver.num_ioctls = ARRAY_SIZE(exynos_ioctls); - match = exynos_drm_match_add(&pdev->dev); - if (IS_ERR(match)) - return PTR_ERR(match); + component_match_add_platform_drivers(&pdev->dev, &match, + exynos_drm_kms_drivers, + ARRAY_SIZE(exynos_drm_kms_drivers)); + + if (!match) + return -ENODEV; return component_master_add_with_match(&pdev->dev, &exynos_drm_ops, match); -- 2.1.4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-09-28 23:54 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-09-28 23:54 [PATCH 1/2] component: Make a "match_add all devices matching my drivers" helper Eric Anholt 2015-09-28 23:54 ` Eric Anholt 2015-09-28 23:54 ` Eric Anholt [this message] 2015-09-28 23:54 ` [PATCH 2/2] drm/exynos: Use the core platform_driver component matching helper Eric Anholt 2015-09-30 14:33 ` Gustavo Padovan 2015-09-30 14:33 ` Gustavo Padovan 2015-09-30 14:32 ` [PATCH 1/2] component: Make a "match_add all devices matching my drivers" helper Gustavo Padovan 2015-09-30 14:32 ` Gustavo Padovan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1443484449-31868-2-git-send-email-eric@anholt.net \ --to=eric@anholt.net \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=gregkh@linuxfoundation.org \ --cc=inki.dae@samsung.com \ --cc=jy0922.shim@samsung.com \ --cc=kyungmin.park@samsung.com \ --cc=linux-kernel@vger.kernel.org \ --cc=sw0312.kim@samsung.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.