Unverified Commit 1a8bf351 authored Jun 29, 2023 by Krzysztof Wilczyński

PCI: meson: Remove cast between incompatible function type

Rather than casting void(*)(struct clk *) to void (*)(void *), that
forces conversion to an incompatible function type, replace the cast
with a small local stub function with a signature that matches what
the devm_add_action_or_reset() function expects.

The sub function takes a void *, then passes it directly to
clk_disable_unprepare(), which handles the more specific type.

Reported by clang when building with warnings enabled:

  drivers/pci/controller/dwc/pci-meson.c:191:6: warning: cast from 'void (*)(struct clk *)' to 'void (*)(void *)' converts to incompatible function type [-Wcast-function-type-strict]
                                   (void (*) (void *))clk_disable_unprepare,
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
No functional changes are intended.

Fixes: 9c0ef6d3 ("PCI: amlogic: Add the Amlogic Meson PCIe controller driver")
Link: https://lore.kernel.org/linux-pci/20230629165956.237832-1-kwilczynski@kernel.org


Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>

parent 06c2afb8

drivers/pci/controller/dwc/pci-meson.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -163,6 +163,13 @@ static int meson_pcie_reset(struct meson_pcie *mp)
		return 0;
		}

		static inline void meson_pcie_disable_clock(void *data)
		{
		struct clk *clk = data;

		clk_disable_unprepare(clk);
		}

		static inline struct clk meson_pcie_probe_clock(struct device dev,
		const char *id, u64 rate)
		{
		@@ -187,9 +194,7 @@ static inline struct clk meson_pcie_probe_clock(struct device dev,
		return ERR_PTR(ret);
		}

		devm_add_action_or_reset(dev,
		(void () (void ))clk_disable_unprepare,
		clk);
		devm_add_action_or_reset(dev, meson_pcie_disable_clock, clk);

		return clk;
		}