Merge tag 'iio-for-4.17a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[linux-2.6-microblaze.git] / drivers / watchdog / sunxi_wdt.c

diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
index 9728fa3..802e31b 100644 (file)
--- a/drivers/watchdog/sunxi_wdt.c
+++ b/drivers/watchdog/sunxi_wdt.c
@@ -234,7 +234,6 @@ MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids);
 static int sunxi_wdt_probe(struct platform_device *pdev)
 {
        struct sunxi_wdt_dev *sunxi_wdt;
-       const struct of_device_id *device;
        struct resource *res;
        int err;
 
@@ -242,12 +241,10 @@ static int sunxi_wdt_probe(struct platform_device *pdev)
        if (!sunxi_wdt)
                return -EINVAL;
 
-       device = of_match_device(sunxi_wdt_dt_ids, &pdev->dev);
-       if (!device)
+       sunxi_wdt->wdt_regs = of_device_get_match_data(&pdev->dev);
+       if (!sunxi_wdt->wdt_regs)
                return -ENODEV;
 
-       sunxi_wdt->wdt_regs = device->data;
-
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        sunxi_wdt->wdt_base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(sunxi_wdt->wdt_base))