niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

clk: samsung: Revert "clk: samsung: exynos-clkout: Use of_device_get_match_data()"

Browse source 
of_device_get_match_data() function should not be used on the device
other than the one matched to the given driver, because it always returns
the match_data of the matched driver. In case of exynos-clkout driver,
the code matched the OF IDs on the PARENT device, so replacing it with
of_device_get_match_data() broke the driver.

This reverts commit 777aaf3d1d.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Fixes: 777aaf3d1d ("clk: samsung: exynos-clkout: Use of_device_get_match_data()")
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20221108213718.32076-1-m.szyprowski@samsung.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
This commit is contained in:
Marek Szyprowski 2022-11-08 22:37:18 +01:00 • committed by Krzysztof Kozlowski
parent 4854e8b083
commit 2bc5febd05
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/clk/samsung/clk-exynos-clkout.c
View file

@ -81,17 +81,19 @@ MODULE_DEVICE_TABLE(of, exynos_clkout_ids);
static int exynos_clkout_match_parent_dev(struct device *dev, u32 *mux_mask) static int exynos_clkout_match_parent_dev(struct device *dev, u32 *mux_mask)
{ {
const struct exynos_clkout_variant *variant; const struct exynos_clkout_variant *variant;
const struct of_device_id *match;
if (!dev->parent) { if (!dev->parent) {
dev_err(dev, "not instantiated from MFD\n"); dev_err(dev, "not instantiated from MFD\n");
return -EINVAL; return -EINVAL;
} }
variant = of_device_get_match_data(dev->parent); match = of_match_device(exynos_clkout_ids, dev->parent);
if (!variant) { if (!match) {
dev_err(dev, "cannot match parent device\n"); dev_err(dev, "cannot match parent device\n");
return -EINVAL; return -EINVAL;
} }
variant = match->data;
*mux_mask = variant->mux_mask; *mux_mask = variant->mux_mask;