[PATCH 2/2] phy: marvell: Remove unused function comphy_update_map()

[Stefan Roese]

On 1/18/22 10:33, Pali Rohár wrote:
> This weak function is not used anymore, so completely remove it.
> 
> Private struct comphy_map is not used by any board code anymore, so move it
> into private driver header file comphy_core.h.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   drivers/phy/marvell/comphy_core.c |  9 ---------
>   drivers/phy/marvell/comphy_core.h |  9 +++++++++
>   include/mvebu/comphy.h            | 11 -----------
>   3 files changed, 9 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c
> index 233a973035b3..5bb994fe42a5 100644
> --- a/drivers/phy/marvell/comphy_core.c
> +++ b/drivers/phy/marvell/comphy_core.c
> @@ -79,11 +79,6 @@ int comphy_rx_training(struct udevice *dev, u32 lane)
>   	return 0;
>   }
>   
> -__weak int comphy_update_map(struct comphy_map *serdes_map, int count)
> -{
> -	return 0;
> -}
> -
>   static int comphy_probe(struct udevice *dev)
>   {
>   	int node = dev_of_offset(dev);
> @@ -126,10 +121,6 @@ static int comphy_probe(struct udevice *dev)
>   	if (res < 0)
>   		return res;
>   
> -	res = comphy_update_map(chip_cfg->comphy_map_data, chip_cfg->comphy_lanes_count);
> -	if (res < 0)
> -		return res;
> -
>   	/* Save CP index for MultiCP devices (A8K) */
>   	chip_cfg->cp_index = current_idx++;
>   	/* PHY power UP sequence */
> diff --git a/drivers/phy/marvell/comphy_core.h b/drivers/phy/marvell/comphy_core.h
> index d573776c05ae..f3d049393876 100644
> --- a/drivers/phy/marvell/comphy_core.h
> +++ b/drivers/phy/marvell/comphy_core.h
> @@ -8,6 +8,7 @@
>   
>   #include <fdtdec.h>
>   #include <mvebu/comphy.h>
> +#include <dt-bindings/comphy/comphy_data.h>
>   
>   #if defined(DEBUG)
>   #define debug_enter()	printf("----> Enter %s\n", __func__);
> @@ -20,6 +21,14 @@
>   #define MAX_LANE_OPTIONS			10
>   #define MAX_UTMI_PHY_COUNT			6
>   
> +struct comphy_map {
> +	u32 type;
> +	u32 speed;
> +	u32 invert;
> +	bool clk_src;
> +	bool end_point;
> +};
> +
>   struct comphy_mux_options {
>   	u32 type;
>   	u32 mux_value;
> diff --git a/include/mvebu/comphy.h b/include/mvebu/comphy.h
> index 4d1b70393b20..14431576e66e 100644
> --- a/include/mvebu/comphy.h
> +++ b/include/mvebu/comphy.h
> @@ -6,17 +6,6 @@
>   #ifndef _MVEBU_COMPHY_H_
>   #define _MVEBU_COMPHY_H_
>   
> -#include <dt-bindings/comphy/comphy_data.h>
> -
> -struct comphy_map {
> -	u32 type;
> -	u32 speed;
> -	u32 invert;
> -	bool clk_src;
> -	bool end_point;
> -};
> -
>   int comphy_rx_training(struct udevice *dev, u32 lane);
> -int comphy_update_map(struct comphy_map *serdes_map, int count);
>   
>   #endif /* _MVEBU_COMPHY_H_ */
> 

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de