@@ -1669,10 +1669,10 @@ static int npcm_video_ece_init(struct npcm_video *video)
dev_err(dev, "Failed to find ECE device\n");
return -ENODEV;
}
+ struct device *ece_dev __free(put_device) = &ece_pdev->dev;
regs = devm_platform_ioremap_resource(ece_pdev, 0);
if (IS_ERR(regs)) {
- put_device(&ece_pdev->dev);
dev_err(dev, "Failed to parse ECE reg in DTS\n");
return PTR_ERR(regs);
}
@@ -1680,13 +1680,11 @@ static int npcm_video_ece_init(struct npcm_video *video)
video->ece.regmap = devm_regmap_init_mmio(dev, regs,
&npcm_video_ece_regmap_cfg);
if (IS_ERR(video->ece.regmap)) {
- put_device(&ece_pdev->dev);
dev_err(dev, "Failed to initialize ECE regmap\n");
return PTR_ERR(video->ece.regmap);
}
- video->ece.reset = devm_reset_control_get(&ece_pdev->dev, NULL);
- put_device(&ece_pdev->dev);
+ video->ece.reset = devm_reset_control_get(ece_dev, NULL);
if (IS_ERR(video->ece.reset)) {
dev_err(dev, "Failed to get ECE reset control in DTS\n");
return PTR_ERR(video->ece.reset);
Instead of manually calling put_device, use the __free macros. Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- drivers/media/platform/nuvoton/npcm-video.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)