| Message ID | 20230629165956.237832-1-kwilczynski@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Krzysztof Wilczyński |
| Headers | show |
| Series | [1/3] PCI: meson: Remove cast between incompatible function type | expand |
On 29/06/2023 18:59, Krzysztof Wilczyński wrote: > 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: 9c0ef6d34fdb ("PCI: amlogic: Add the Amlogic Meson PCIe controller driver") > Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> > --- > drivers/pci/controller/dwc/pci-meson.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > <snip> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Hello, > 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. Applied to controller/remove-void-cast, thank you everyone! [01/03] PCI: meson: Remove cast between incompatible function type https://git.kernel.org/pci/pci/c/60fce60ab7b6 [02/03] PCI: keembay: Remove cast between incompatible function type https://git.kernel.org/pci/pci/c/43a2eef7cbba [03/03] PCI: microchip: Remove cast between incompatible function type https://git.kernel.org/pci/pci/c/9e4811ce626f Krzysztof
diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c index c1527693bed9..34990a6363d0 100644 --- a/drivers/pci/controller/dwc/pci-meson.c +++ b/drivers/pci/controller/dwc/pci-meson.c @@ -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; }
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: 9c0ef6d34fdb ("PCI: amlogic: Add the Amlogic Meson PCIe controller driver") Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> --- drivers/pci/controller/dwc/pci-meson.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)