OSDN Git Service

watchdog: meson_wdt: Use device_get_match_data() helper
authorTian Tao <tiantao6@hisilicon.com>
Thu, 1 Apr 2021 02:25:21 +0000 (10:25 +0800)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Mon, 21 Jun 2021 06:49:05 +0000 (08:49 +0200)
Use the device_get_match_data() helper instead of open coding.

Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/1617243921-56774-1-git-send-email-tiantao6@hisilicon.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/watchdog/meson_wdt.c

index 459f3ae..539feaa 100644 (file)
@@ -162,7 +162,6 @@ static int meson_wdt_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct meson_wdt_dev *meson_wdt;
-       const struct of_device_id *of_id;
        int err;
 
        meson_wdt = devm_kzalloc(dev, sizeof(*meson_wdt), GFP_KERNEL);
@@ -173,12 +172,7 @@ static int meson_wdt_probe(struct platform_device *pdev)
        if (IS_ERR(meson_wdt->wdt_base))
                return PTR_ERR(meson_wdt->wdt_base);
 
-       of_id = of_match_device(meson_wdt_dt_ids, dev);
-       if (!of_id) {
-               dev_err(dev, "Unable to initialize WDT data\n");
-               return -ENODEV;
-       }
-       meson_wdt->data = of_id->data;
+       meson_wdt->data = device_get_match_data(dev);
 
        meson_wdt->wdt_dev.parent = dev;
        meson_wdt->wdt_dev.info = &meson_wdt_info;