.. | .. |
---|
116 | 116 | |
---|
117 | 117 | static int dc_wdt_probe(struct platform_device *pdev) |
---|
118 | 118 | { |
---|
119 | | - struct resource *res; |
---|
120 | 119 | struct device *dev = &pdev->dev; |
---|
121 | 120 | struct dc_wdt *wdt; |
---|
122 | | - int ret; |
---|
123 | 121 | |
---|
124 | 122 | wdt = devm_kzalloc(dev, sizeof(struct dc_wdt), GFP_KERNEL); |
---|
125 | 123 | if (!wdt) |
---|
126 | 124 | return -ENOMEM; |
---|
127 | 125 | |
---|
128 | | - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
---|
129 | | - wdt->base = devm_ioremap_resource(dev, res); |
---|
| 126 | + wdt->base = devm_platform_ioremap_resource(pdev, 0); |
---|
130 | 127 | if (IS_ERR(wdt->base)) |
---|
131 | 128 | return PTR_ERR(wdt->base); |
---|
132 | 129 | |
---|
.. | .. |
---|
143 | 140 | watchdog_set_restart_priority(&dc_wdt_wdd, 128); |
---|
144 | 141 | watchdog_init_timeout(&dc_wdt_wdd, timeout, dev); |
---|
145 | 142 | watchdog_stop_on_reboot(&dc_wdt_wdd); |
---|
146 | | - ret = devm_watchdog_register_device(dev, &dc_wdt_wdd); |
---|
147 | | - if (ret) { |
---|
148 | | - dev_err(dev, "Failed to register watchdog device"); |
---|
149 | | - return ret; |
---|
150 | | - } |
---|
151 | | - |
---|
152 | | - return 0; |
---|
| 143 | + return devm_watchdog_register_device(dev, &dc_wdt_wdd); |
---|
153 | 144 | } |
---|
154 | 145 | |
---|
155 | 146 | static const struct of_device_id dc_wdt_of_match[] = { |
---|