Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aec74a14 authored by Jerome Brunet's avatar Jerome Brunet Committed by Greg Kroah-Hartman
Browse files

nvmem: meson-efuse: fix function pointer type mismatch 



[ Upstream commit cbd38332c140829ab752ba4e727f98be5c257f18 ]

clang-16 warns about casting functions to incompatible types, as is done
here to call clk_disable_unprepare:

drivers/nvmem/meson-efuse.c:78:12: error: cast from 'void (*)(struct clk *)' to 'void (*)(void *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
   78 |                                        (void(*)(void *))clk_disable_unprepare,

The pattern of getting, enabling and setting a disable callback for a
clock can be replaced with devm_clk_get_enabled(), which also fixes
this warning.

Fixes: 611fbca1 ("nvmem: meson-efuse: add peripheral clock")
Cc: Stable@vger.kernel.org
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarJustin Stitt <justinstitt@google.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20240224114023.85535-2-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 525ae72d

drivers/nvmem/meson-efuse.c

+3 −22
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ static int meson_efuse_probe(struct platform_device *pdev) 
	struct nvmem_config *econfig;

	struct clk *clk;

	unsigned int size;

	int ret;



	sm_np = of_parse_phandle(pdev->dev.of_node, "secure-monitor", 0);

	if (!sm_np) {
@@ -60,27 +59,9 @@ static int meson_efuse_probe(struct platform_device *pdev) 
	if (!fw)

		return -EPROBE_DEFER;



	clk = devm_clk_get(dev, NULL);

	if (IS_ERR(clk)) {

		ret = PTR_ERR(clk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "failed to get efuse gate");

		return ret;

	}



	ret = clk_prepare_enable(clk);

	if (ret) {

		dev_err(dev, "failed to enable gate");

		return ret;

	}



	ret = devm_add_action_or_reset(dev,

				       (void(*)(void *))clk_disable_unprepare,

				       clk);

	if (ret) {

		dev_err(dev, "failed to add disable callback");

		return ret;

	}

	clk = devm_clk_get_enabled(dev, NULL);

	if (IS_ERR(clk))

		return dev_err_probe(dev, PTR_ERR(clk), "failed to get efuse gate");



	if (meson_sm_call(fw, SM_EFUSE_USER_MAX, &size, 0, 0, 0, 0, 0) < 0) {

		dev_err(dev, "failed to get max user");