Commit ab9f0d04 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Stephen Boyd
Browse files

clk: Use str_enable_disable-like helpers 



Replace ternary (condition ? "enable" : "disable") syntax with helpers
from string_choices.h because:
1. Simple function call with one argument is easier to read.  Ternary
   operator has three arguments and with wrapping might lead to quite
   long code.
2. Is slightly shorter thus also easier to read.
3. It brings uniformity in the text - same string.
4. Allows deduping by the linker, which results in a smaller binary
   file.

Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20250114190612.846696-1-krzysztof.kozlowski@linaro.org


Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 54e020bd

drivers/clk/bcm/clk-kona.c

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/clk-provider.h>

#include <linux/string_choices.h>



/*

 * "Policies" affect the frequencies of bus clocks provided by a
@@ -502,7 +503,7 @@ static int clk_gate(struct ccu_data *ccu, const char *name, 
		return 0;



	pr_err("%s: failed to %s gate for %s\n", __func__,

		enable ? "enable" : "disable", name);

		str_enable_disable(enable), name);



	return -EIO;

}

drivers/clk/clk-nomadik.c

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/debugfs.h>

#include <linux/seq_file.h>

#include <linux/spinlock.h>

#include <linux/string_choices.h>

#include <linux/reboot.h>



/*
@@ -116,9 +117,9 @@ static void __init nomadik_src_init(void) 


	val = readl(src_base + SRC_XTALCR);

	pr_info("SXTALO is %s\n",

		(val & SRC_XTALCR_SXTALDIS) ? "disabled" : "enabled");

		str_disabled_enabled(val & SRC_XTALCR_SXTALDIS));

	pr_info("MXTAL is %s\n",

		(val & SRC_XTALCR_MXTALSTAT) ? "enabled" : "disabled");

		str_enabled_disabled(val & SRC_XTALCR_MXTALSTAT));

	if (of_property_read_bool(np, "disable-sxtalo")) {

		/* The machine uses an external oscillator circuit */

		val |= SRC_XTALCR_SXTALDIS;

drivers/clk/clk-xgene.c

+2 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */

#include <linux/module.h>

#include <linux/spinlock.h>

#include <linux/string_choices.h>

#include <linux/io.h>

#include <linux/of.h>

#include <linux/clkdev.h>
@@ -520,8 +521,7 @@ static int xgene_clk_is_enabled(struct clk_hw *hw) 
		data = xgene_clk_read(pclk->param.csr_reg +

					pclk->param.reg_clk_offset);

		pr_debug("%s clock is %s\n", clk_hw_get_name(hw),

			data & pclk->param.reg_clk_mask ? "enabled" :

							"disabled");

			str_enabled_disabled(data & pclk->param.reg_clk_mask));

	} else {

		return 1;

	}

drivers/clk/qcom/clk-rpmh.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/string_choices.h>

#include <soc/qcom/cmd-db.h>

#include <soc/qcom/rpmh.h>

#include <soc/qcom/tcs.h>
@@ -206,7 +207,7 @@ static int clk_rpmh_aggregate_state_send_command(struct clk_rpmh *c, 
		c->state = c->valid_state_mask;



	WARN(1, "clk: %s failed to %s\n", c->res_name,

	     enable ? "enable" : "disable");

	     str_enable_disable(enable));

	return ret;

}