Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 07:23:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

watchdog: meson_wdt: Use device_get_match_data() helper

Browse Source 
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>
This commit is contained in:
Tian Tao 2021-04-01 10:25:21 +08:00 committed by Wim Van Sebroeck
parent c891ef7d80
commit 0a1186e49b
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/watchdog/meson_wdt.c
View File

@ -162,7 +162,6 @@ static int meson_wdt_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct meson_wdt_dev *meson_wdt; struct meson_wdt_dev *meson_wdt;
const struct of_device_id *of_id;
int err; int err;
meson_wdt = devm_kzalloc(dev, sizeof(*meson_wdt), GFP_KERNEL); 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)) if (IS_ERR(meson_wdt->wdt_base))
return PTR_ERR(meson_wdt->wdt_base); return PTR_ERR(meson_wdt->wdt_base);
of_id = of_match_device(meson_wdt_dt_ids, dev); meson_wdt->data = device_get_match_data(dev);
if (!of_id) {
dev_err(dev, "Unable to initialize WDT data\n");
return -ENODEV;
}
meson_wdt->data = of_id->data;
meson_wdt->wdt_dev.parent = dev; meson_wdt->wdt_dev.parent = dev;
meson_wdt->wdt_dev.info = &meson_wdt_info; meson_wdt->wdt_dev.info = &meson_wdt_info;