| .. | .. |
|---|
| 122 | 122 | |
|---|
| 123 | 123 | static int ts72xx_wdt_probe(struct platform_device *pdev) |
|---|
| 124 | 124 | { |
|---|
| 125 | + struct device *dev = &pdev->dev; |
|---|
| 125 | 126 | struct ts72xx_wdt_priv *priv; |
|---|
| 126 | 127 | struct watchdog_device *wdd; |
|---|
| 127 | | - struct resource *res; |
|---|
| 128 | 128 | int ret; |
|---|
| 129 | 129 | |
|---|
| 130 | | - priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); |
|---|
| 130 | + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); |
|---|
| 131 | 131 | if (!priv) |
|---|
| 132 | 132 | return -ENOMEM; |
|---|
| 133 | 133 | |
|---|
| 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); |
|---|
| 136 | 135 | if (IS_ERR(priv->control_reg)) |
|---|
| 137 | 136 | return PTR_ERR(priv->control_reg); |
|---|
| 138 | 137 | |
|---|
| 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); |
|---|
| 141 | 139 | if (IS_ERR(priv->feed_reg)) |
|---|
| 142 | 140 | return PTR_ERR(priv->feed_reg); |
|---|
| 143 | 141 | |
|---|
| .. | .. |
|---|
| 146 | 144 | wdd->ops = &ts72xx_wdt_ops; |
|---|
| 147 | 145 | wdd->min_timeout = 1; |
|---|
| 148 | 146 | wdd->max_hw_heartbeat_ms = 8000; |
|---|
| 149 | | - wdd->parent = &pdev->dev; |
|---|
| 147 | + wdd->parent = dev; |
|---|
| 150 | 148 | |
|---|
| 151 | 149 | watchdog_set_nowayout(wdd, nowayout); |
|---|
| 152 | 150 | |
|---|
| 153 | 151 | wdd->timeout = TS72XX_WDT_DEFAULT_TIMEOUT; |
|---|
| 154 | | - watchdog_init_timeout(wdd, timeout, &pdev->dev); |
|---|
| 152 | + watchdog_init_timeout(wdd, timeout, dev); |
|---|
| 155 | 153 | |
|---|
| 156 | 154 | watchdog_set_drvdata(wdd, priv); |
|---|
| 157 | 155 | |
|---|
| 158 | | - ret = devm_watchdog_register_device(&pdev->dev, wdd); |
|---|
| 156 | + ret = devm_watchdog_register_device(dev, wdd); |
|---|
| 159 | 157 | if (ret) |
|---|
| 160 | 158 | return ret; |
|---|
| 161 | 159 | |
|---|
| 162 | | - dev_info(&pdev->dev, "TS-72xx Watchdog driver\n"); |
|---|
| 160 | + dev_info(dev, "TS-72xx Watchdog driver\n"); |
|---|
| 163 | 161 | |
|---|
| 164 | 162 | return 0; |
|---|
| 165 | 163 | } |
|---|