On 4/8/24 09:27, Christophe ROULLIER wrote:
>> -----Original Message-----
>> From: Marek Vasut <[email protected]>
>> Sent: Tuesday, March 26, 2024 1:07 PM
>> To: [email protected]
>> Cc: Marek Vasut <[email protected]>; Patrice CHOTARD - foss
>> <[email protected]>; Christophe ROULLIER
>> <[email protected]>; Joe Hershberger <[email protected]>;
>> Patrick DELAUNAY - foss <[email protected]>; Ramon Fried
>> <[email protected]>; [email protected];
>> [email protected]
>> Subject: [PATCH v2 04/11] net: dwc_eth_qos: Scrub ifdeffery
>>
>> Replace ifdef CONFIG_CLK with if (CONFIG_IS_ENABLED(CLK)) to improve code
>> build coverage. Some of the functions printed debug("%s: OK\n", __func__);
>> on exit with and without CLK enabled, some did not, make it consistent and
>> print nothing if CLK is disabled.
>>
>> Reviewed-by: Patrice Chotard <[email protected]>
>> Signed-off-by: Marek Vasut <[email protected]>
>> ---
>> Cc: Christophe Roullier <[email protected]>
>> Cc: Joe Hershberger <[email protected]>
>> Cc: Patrice Chotard <[email protected]>
>> Cc: Patrick Delaunay <[email protected]>
>> Cc: Ramon Fried <[email protected]>
>> Cc: [email protected]
>> Cc: [email protected]
>> ---
>> V2: Add RB from Patrice
>> ---
>> drivers/net/dwc_eth_qos_stm32.c | 25 ++++++++++++-------------
>> 1 file changed, 12 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/net/dwc_eth_qos_stm32.c
>> b/drivers/net/dwc_eth_qos_stm32.c index 7520a136ed0..d7ec0c9be36 100644
>> --- a/drivers/net/dwc_eth_qos_stm32.c
>> +++ b/drivers/net/dwc_eth_qos_stm32.c
>> @@ -46,21 +46,22 @@
>>
>> static ulong eqos_get_tick_clk_rate_stm32(struct udevice *dev) { -#ifdef
>> CONFIG_CLK
>> - struct eqos_priv *eqos = dev_get_priv(dev);
>> + struct eqos_priv __maybe_unused *eqos = dev_get_priv(dev);
>> +
>> + if (!CONFIG_IS_ENABLED(CLK))
>> + return 0;
>>
>> return clk_get_rate(&eqos->clk_master_bus);
>> -#else
>> - return 0;
>> -#endif
>> }
>>
>> static int eqos_start_clks_stm32(struct udevice *dev) { -#ifdef CONFIG_CLK
>> - struct eqos_priv *eqos = dev_get_priv(dev);
>> + struct eqos_priv __maybe_unused *eqos = dev_get_priv(dev);
>> int ret;
>>
>> + if (!CONFIG_IS_ENABLED(CLK))
>> + return 0;
>> +
>> debug("%s(dev=%p):\n", __func__, dev);
>>
>> ret = clk_enable(&eqos->clk_master_bus);
>> @@ -89,12 +90,10 @@ static int eqos_start_clks_stm32(struct udevice *dev)
>> }
>> eqos->clk_ck_enabled = true;
>> }
>> -#endif
>>
>> debug("%s: OK\n", __func__);
>> return 0;
>>
>> -#ifdef CONFIG_CLK
>> err_disable_clk_tx:
>> clk_disable(&eqos->clk_tx);
>> err_disable_clk_rx:
>> @@ -104,20 +103,20 @@ err_disable_clk_master_bus:
>> err:
>> debug("%s: FAILED: %d\n", __func__, ret);
>> return ret;
>> -#endif
>> }
>>
>> static int eqos_stop_clks_stm32(struct udevice *dev) { -#ifdef CONFIG_CLK
>> - struct eqos_priv *eqos = dev_get_priv(dev);
>> + struct eqos_priv __maybe_unused *eqos = dev_get_priv(dev);
>> +
>> + if (!CONFIG_IS_ENABLED(CLK))
>> + return 0;
>>
>> debug("%s(dev=%p):\n", __func__, dev);
>>
>> clk_disable(&eqos->clk_tx);
>> clk_disable(&eqos->clk_rx);
>> clk_disable(&eqos->clk_master_bus);
>> -#endif
>>
>> debug("%s: OK\n", __func__);
>> return 0;
>> --
>> 2.43.0
>>
> Reviewed-by: Christophe ROULLIER <[email protected]>
Applied on u-boot-stm32/master
