~hc/RK356X_SDK_RELEASE.git

..	..	@@ -98,14 +98,6 @@
98	98	.set_timeout = men_z069_wdt_set_timeout,
99	99	};
100	100
101		-static struct watchdog_device men_z069_wdt = {
102		- .info = &men_z069_info,
103		- .ops = &men_z069_ops,
104		- .timeout = MEN_Z069_DEFAULT_TIMEOUT,
105		- .min_timeout = 1,
106		- .max_timeout = MEN_Z069_WDT_COUNTER_MAX / MEN_Z069_TIMER_FREQ,
107		-};
108		-
109	101	static int men_z069_probe(struct mcb_device *dev,
110	102	const struct mcb_device_id *id)
111	103	{
..	..	@@ -125,15 +117,19 @@
125	117	goto release_mem;
126	118
127	119	drv->mem = mem;
	120	+ drv->wdt.info = &men_z069_info;
	121	+ drv->wdt.ops = &men_z069_ops;
	122	+ drv->wdt.timeout = MEN_Z069_DEFAULT_TIMEOUT;
	123	+ drv->wdt.min_timeout = 1;
	124	+ drv->wdt.max_timeout = MEN_Z069_WDT_COUNTER_MAX / MEN_Z069_TIMER_FREQ;
128	125
129		- drv->wdt = men_z069_wdt;
130	126	watchdog_init_timeout(&drv->wdt, 0, &dev->dev);
131	127	watchdog_set_nowayout(&drv->wdt, nowayout);
132	128	watchdog_set_drvdata(&drv->wdt, drv);
133	129	drv->wdt.parent = &dev->dev;
134	130	mcb_set_drvdata(dev, drv);
135	131
136		- return watchdog_register_device(&men_z069_wdt);
	132	+ return watchdog_register_device(&drv->wdt);
137	133
138	134	release_mem:
139	135	mcb_release_mem(mem);
..	..	@@ -168,3 +164,4 @@
168	164	MODULE_AUTHOR("Johannes Thumshirn <jth@kernel.org>");
169	165	MODULE_LICENSE("GPL v2");
170	166	MODULE_ALIAS("mcb:16z069");
	167	+MODULE_IMPORT_NS(MCB);