Re: [PATCH net-next] net: liquidio: Remove unused validate_cn23xx_pf_config_info()

[Michal Swiatkowski]

On Sun, Jun 15, 2025 at 12:49:41AM +0100, linux@xxxxxxxxxxx wrote:
> From: "Dr. David Alan Gilbert" <linux@xxxxxxxxxxx>
> 
> [Note, I'm wondering if actually this is a case of a missing call;
> the other similar function is called in __verify_octeon_config_info(),
> but I don't have or know the hardware.]
> 
> validate_cn23xx_pf_config_info() was added in 2016 by
> commit 72c0091293c0 ("liquidio: CN23XX device init and sriov config")
> 
> Remove it.
> 
> Signed-off-by: Dr. David Alan Gilbert <linux@xxxxxxxxxxx>
> ---
>  .../cavium/liquidio/cn23xx_pf_device.c        | 39 -------------------
>  .../cavium/liquidio/cn23xx_pf_device.h        |  3 --
>  2 files changed, 42 deletions(-)
> 
> diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
> index ff8f2f9f9cae..75f22f74774c 100644
> --- a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
> +++ b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
> @@ -1208,45 +1208,6 @@ int setup_cn23xx_octeon_pf_device(struct octeon_device *oct)
>  }
>  EXPORT_SYMBOL_GPL(setup_cn23xx_octeon_pf_device);
>  
> -int validate_cn23xx_pf_config_info(struct octeon_device *oct,
> -				   struct octeon_config *conf23xx)
> -{
> -	if (CFG_GET_IQ_MAX_Q(conf23xx) > CN23XX_MAX_INPUT_QUEUES) {
> -		dev_err(&oct->pci_dev->dev, "%s: Num IQ (%d) exceeds Max (%d)\n",
> -			__func__, CFG_GET_IQ_MAX_Q(conf23xx),
> -			CN23XX_MAX_INPUT_QUEUES);
> -		return 1;
> -	}
> -
> -	if (CFG_GET_OQ_MAX_Q(conf23xx) > CN23XX_MAX_OUTPUT_QUEUES) {
> -		dev_err(&oct->pci_dev->dev, "%s: Num OQ (%d) exceeds Max (%d)\n",
> -			__func__, CFG_GET_OQ_MAX_Q(conf23xx),
> -			CN23XX_MAX_OUTPUT_QUEUES);
> -		return 1;
> -	}
> -
> -	if (CFG_GET_IQ_INSTR_TYPE(conf23xx) != OCTEON_32BYTE_INSTR &&
> -	    CFG_GET_IQ_INSTR_TYPE(conf23xx) != OCTEON_64BYTE_INSTR) {
> -		dev_err(&oct->pci_dev->dev, "%s: Invalid instr type for IQ\n",
> -			__func__);
> -		return 1;
> -	}
> -
> -	if (!CFG_GET_OQ_REFILL_THRESHOLD(conf23xx)) {
> -		dev_err(&oct->pci_dev->dev, "%s: Invalid parameter for OQ\n",
> -			__func__);
> -		return 1;
> -	}
> -
> -	if (!(CFG_GET_OQ_INTR_TIME(conf23xx))) {
> -		dev_err(&oct->pci_dev->dev, "%s: Invalid parameter for OQ\n",
> -			__func__);
> -		return 1;
> -	}
> -
> -	return 0;
> -}
> -
>  int cn23xx_fw_loaded(struct octeon_device *oct)
>  {
>  	u64 val;
> diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h
> index 234b96b4f488..bbe9f3133b07 100644
> --- a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h
> +++ b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h
> @@ -54,9 +54,6 @@ struct oct_vf_stats {
>  
>  int setup_cn23xx_octeon_pf_device(struct octeon_device *oct);
>  
> -int validate_cn23xx_pf_config_info(struct octeon_device *oct,
> -				   struct octeon_config *conf23xx);
> -

Looks like it was never used, even in the patch when it was introduced.
I wonder if it shouldn't go to __verify_octeon_config_info() for
OCTEON_CN23XX_PF_VID, but if it works for such long time, I think it is
fine to drop.

Reviewed-by: Michal Swiatkowski <michal.swiatkowski@xxxxxxxxxxxxxxx>

>  u32 cn23xx_pf_get_oq_ticks(struct octeon_device *oct, u32 time_intr_in_us);
>  
>  int cn23xx_sriov_config(struct octeon_device *oct);
> -- 
> 2.49.0