]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: stmmac: dwmac-meson8b: Avoid cast to incompatible function type
authorSimon Horman <horms@kernel.org>
Tue, 18 Apr 2023 11:07:33 +0000 (13:07 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 20 Apr 2023 01:40:03 +0000 (18:40 -0700)
Rather than casting clk_disable_unprepare to an incompatible function
type provide a trivial wrapper with the correct signature for the
use-case.

Reported by clang-16 with W=1:

 drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c:276:6: error: cast from 'void (*)(struct clk *)' to 'void (*)(void *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
                                        (void(*)(void *))clk_disable_unprepare,
                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
No functional change intended.
Compile tested only.

Signed-off-by: Simon Horman <horms@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Link: https://lore.kernel.org/r/20230418-dwmac-meson8b-clk-cb-cast-v1-1-e892b670cbbb@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c

index e8b507f88fbce0b70e2892e41ea3c04fa011f718..f6754e3643f3e37406218b0a797d758ac90bbfdd 100644 (file)
@@ -263,6 +263,11 @@ static int meson_axg_set_phy_mode(struct meson8b_dwmac *dwmac)
        return 0;
 }
 
+static void meson8b_clk_disable_unprepare(void *data)
+{
+       clk_disable_unprepare(data);
+}
+
 static int meson8b_devm_clk_prepare_enable(struct meson8b_dwmac *dwmac,
                                           struct clk *clk)
 {
@@ -273,8 +278,7 @@ static int meson8b_devm_clk_prepare_enable(struct meson8b_dwmac *dwmac,
                return ret;
 
        return devm_add_action_or_reset(dwmac->dev,
-                                       (void(*)(void *))clk_disable_unprepare,
-                                       clk);
+                                       meson8b_clk_disable_unprepare, clk);
 }
 
 static int meson8b_init_rgmii_delays(struct meson8b_dwmac *dwmac)