clk: clk-max77686: Clean clkdev lookup leak and use devm (8144e1e8) · Commits · 戴 / test

drivers/clk/clk-max77686.c

+6 −22

Original line number	Diff line number	Diff line
		@@ -235,8 +235,9 @@ static int max77686_clk_probe(struct platform_device *pdev)
		return ret;
		}

		ret = clk_hw_register_clkdev(&max_clk_data->hw,
		max_clk_data->clk_idata.name, NULL);
		ret = devm_clk_hw_register_clkdev(dev, &max_clk_data->hw,
		max_clk_data->clk_idata.name,
		NULL);
		if (ret < 0) {
		dev_err(dev, "Failed to clkdev register: %d\n", ret);
		return ret;
		@@ -244,7 +245,7 @@ static int max77686_clk_probe(struct platform_device *pdev)
		}

		if (parent->of_node) {
		ret = of_clk_add_hw_provider(parent->of_node, of_clk_max77686_get,
		ret = devm_of_clk_add_hw_provider(dev, of_clk_max77686_get,
		drv_data);

		if (ret < 0) {
		@@ -261,25 +262,9 @@ static int max77686_clk_probe(struct platform_device *pdev)
		1 << MAX77802_CLOCK_LOW_JITTER_SHIFT);
		if (ret < 0) {
		dev_err(dev, "Failed to config low-jitter: %d\n", ret);
		goto remove_of_clk_provider;
		}
		}

		return 0;

		remove_of_clk_provider:
		if (parent->of_node)
		of_clk_del_provider(parent->of_node);

		return ret;
		}

		static int max77686_clk_remove(struct platform_device *pdev)
		{
		struct device *parent = pdev->dev.parent;

		if (parent->of_node)
		of_clk_del_provider(parent->of_node);
		}

		return 0;
		}
		@@ -297,7 +282,6 @@ static struct platform_driver max77686_clk_driver = {
		.name = "max77686-clk",
		},
		.probe = max77686_clk_probe,
		.remove = max77686_clk_remove,
		.id_table = max77686_clk_id,
		};