| Message ID | 20230629165956.237832-3-kwilczynski@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] PCI: meson: Remove cast between incompatible function type | expand |
On Thu, Jun 29, 2023 at 04:59:56PM +0000, 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/pcie-microchip-host.c:866:32: warning: cast from 'void (*)(struct clk *)' to 'void (*)(void *)' converts to incompatible function type [-Wcast-function-type-strict] > devm_add_action_or_reset(dev, (void (*) (void *))clk_disable_unprepare, > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > No functional changes are intended. > > Fixes: 6f15a9c9f941 ("PCI: microchip: Add Microchip PolarFire PCIe controller driver") > Co-developed-by: Daire McNamara <daire.mcnamara@microchip.com> > Signed-off-by: Daire McNamara <daire.mcnamara@microchip.com> > Co-developed-by: Simon Horman <horms@kernel.org> > Signed-off-by: Simon Horman <horms@kernel.org> > Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> This looks to be the same content wise as the patch I previously acked & effectively the same as the one I previously reviewed - you could have picked up either of those tags from the other submissions tbh. Acked-by: Conor Dooley <conor.dooley@microchip.com> Cheers, Conor.
Hello, [...] > > Fixes: 6f15a9c9f941 ("PCI: microchip: Add Microchip PolarFire PCIe controller driver") > > Co-developed-by: Daire McNamara <daire.mcnamara@microchip.com> > > Signed-off-by: Daire McNamara <daire.mcnamara@microchip.com> > > Co-developed-by: Simon Horman <horms@kernel.org> > > Signed-off-by: Simon Horman <horms@kernel.org> > > Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> > > This looks to be the same content wise as the patch I previously acked & > effectively the same as the one I previously reviewed - you could have > picked up either of those tags from the other submissions tbh. I had thought about it but decided against it, as I wasn't sure if that would be OK, given a new series and new author, etc., even though the code is almost identical. I have seen you offered Reviewed-by and Acked-by once before, and I appreciate that. > Acked-by: Conor Dooley <conor.dooley@microchip.com> Thank you! Krzysztof
diff --git a/drivers/pci/controller/pcie-microchip-host.c b/drivers/pci/controller/pcie-microchip-host.c index 5e710e485464..d30286f815e7 100644 --- a/drivers/pci/controller/pcie-microchip-host.c +++ b/drivers/pci/controller/pcie-microchip-host.c @@ -848,6 +848,13 @@ static const struct irq_domain_ops event_domain_ops = { .map = mc_pcie_event_map, }; +static inline void mc_pcie_deinit_clk(void *data) +{ + struct clk *clk = data; + + clk_disable_unprepare(clk); +} + static inline struct clk *mc_pcie_init_clk(struct device *dev, const char *id) { struct clk *clk; @@ -863,8 +870,7 @@ static inline struct clk *mc_pcie_init_clk(struct device *dev, const char *id) if (ret) return ERR_PTR(ret); - devm_add_action_or_reset(dev, (void (*) (void *))clk_disable_unprepare, - clk); + devm_add_action_or_reset(dev, mc_pcie_deinit_clk, 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/pcie-microchip-host.c:866:32: warning: cast from 'void (*)(struct clk *)' to 'void (*)(void *)' converts to incompatible function type [-Wcast-function-type-strict] devm_add_action_or_reset(dev, (void (*) (void *))clk_disable_unprepare, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ No functional changes are intended. Fixes: 6f15a9c9f941 ("PCI: microchip: Add Microchip PolarFire PCIe controller driver") Co-developed-by: Daire McNamara <daire.mcnamara@microchip.com> Signed-off-by: Daire McNamara <daire.mcnamara@microchip.com> Co-developed-by: Simon Horman <horms@kernel.org> Signed-off-by: Simon Horman <horms@kernel.org> Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> --- drivers/pci/controller/pcie-microchip-host.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)