gpu: host1x: Use of_device_get_match_data()

Avoid some boilerplate by calling of_device_get_match_data() instead of
open-coding the equivalent in the driver.

While at it, shuffle around some code to avoid unnecessary local
variables.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index 7f22c5c37660831ec5f2078f4b0717e78947d861..34a3583e45024a972cb59abc40dbab843efaaf2f 100644 (file)
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -116,15 +116,16 @@ MODULE_DEVICE_TABLE(of, host1x_of_match);
 
 static int host1x_probe(struct platform_device *pdev)
 {
-       const struct of_device_id *id;
        struct host1x *host;
        struct resource *regs;
        int syncpt_irq;
        int err;
 
-       id = of_match_device(host1x_of_match, &pdev->dev);
-       if (!id)
-               return -EINVAL;
+       host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL);
+       if (!host)
+               return -ENOMEM;
+
+       host->info = of_device_get_match_data(&pdev->dev);
 
        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!regs) {
@@ -138,15 +139,10 @@ static int host1x_probe(struct platform_device *pdev)
                return syncpt_irq;
        }
 
-       host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL);
-       if (!host)
-               return -ENOMEM;
-
        mutex_init(&host->devices_lock);
        INIT_LIST_HEAD(&host->devices);
        INIT_LIST_HEAD(&host->list);
        host->dev = &pdev->dev;
-       host->info = id->data;
 
        /* set common host1x device data */
        platform_set_drvdata(pdev, host);