Skip to content

Commit

Permalink
PCI: meson: Remove cast between incompatible function type
Browse files Browse the repository at this point in the history
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: 9c0ef6d ("PCI: amlogic: Add the Amlogic Meson PCIe controller driver")
Link: https://lore.kernel.org/linux-pci/[email protected]
Reviewed-by: Neil Armstrong <[email protected]>
Signed-off-by: Krzysztof Wilczyński <[email protected]>
  • Loading branch information
kwilczynski committed Jul 13, 2023
1 parent 06c2afb commit 1a8bf35
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions drivers/pci/controller/dwc/pci-meson.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
}
Expand Down

0 comments on commit 1a8bf35

Please sign in to comment.