hc
2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b
kernel/drivers/watchdog/ts72xx_wdt.c
....@@ -122,22 +122,20 @@
122122
123123 static int ts72xx_wdt_probe(struct platform_device *pdev)
124124 {
125
+ struct device *dev = &pdev->dev;
125126 struct ts72xx_wdt_priv *priv;
126127 struct watchdog_device *wdd;
127
- struct resource *res;
128128 int ret;
129129
130
- priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
130
+ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
131131 if (!priv)
132132 return -ENOMEM;
133133
134
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
135
- priv->control_reg = devm_ioremap_resource(&pdev->dev, res);
134
+ priv->control_reg = devm_platform_ioremap_resource(pdev, 0);
136135 if (IS_ERR(priv->control_reg))
137136 return PTR_ERR(priv->control_reg);
138137
139
- res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
140
- priv->feed_reg = devm_ioremap_resource(&pdev->dev, res);
138
+ priv->feed_reg = devm_platform_ioremap_resource(pdev, 1);
141139 if (IS_ERR(priv->feed_reg))
142140 return PTR_ERR(priv->feed_reg);
143141
....@@ -146,20 +144,20 @@
146144 wdd->ops = &ts72xx_wdt_ops;
147145 wdd->min_timeout = 1;
148146 wdd->max_hw_heartbeat_ms = 8000;
149
- wdd->parent = &pdev->dev;
147
+ wdd->parent = dev;
150148
151149 watchdog_set_nowayout(wdd, nowayout);
152150
153151 wdd->timeout = TS72XX_WDT_DEFAULT_TIMEOUT;
154
- watchdog_init_timeout(wdd, timeout, &pdev->dev);
152
+ watchdog_init_timeout(wdd, timeout, dev);
155153
156154 watchdog_set_drvdata(wdd, priv);
157155
158
- ret = devm_watchdog_register_device(&pdev->dev, wdd);
156
+ ret = devm_watchdog_register_device(dev, wdd);
159157 if (ret)
160158 return ret;
161159
162
- dev_info(&pdev->dev, "TS-72xx Watchdog driver\n");
160
+ dev_info(dev, "TS-72xx Watchdog driver\n");
163161
164162 return 0;
165163 }