net: liquidio: Remove unused validate_cn23xx_pf_config_info()
Subsystems (3)
PATCH 1/1 net: liquidio: Remove unused validate_cn23xx_pf_config_info()
From: "Dr. David Alan Gilbert" <[email protected]>
[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.
--- .../cavium/liquidio/cn23xx_pf_device.c | 39 ------------------- .../cavium/liquidio/cn23xx_pf_device.h | 3 -- 2 files changed, 42 deletions(-)
drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c +0 -39
@@ -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;
drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h +0 -3
@@ -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); -u32 cn23xx_pf_get_oq_ticks (struct octeon_device *oct,u32 time_intr_in_us);int cn23xx_sriov_config (struct octeon_device *oct);
Signature · 1 line
2.49.0
Quoted 72 lines · On Sun, Jun 15, 2025 at 12:49:41AM +0100, [email protected] wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
[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 commit72c0091293c0("liquidio: CN23XX device init and sriov config")Remove it.
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- .../cavium/liquidio/cn23xx_pf_device.c | 39 ------------------- .../cavium/liquidio/cn23xx_pf_device.h | 3 -- 2 files changed, 42 deletions(-)drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c +0
-39@@ -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;drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h +0
-0
drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h struct oct_vf_stats { · line 59
Quoted 6 lines
drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h +0
-3@@ -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.
Quoted 5 lines
drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h +0
-0u32 cn23xx_pf_get_oq_ticks (struct octeon_device *oct,u32 time_intr_in_us);int cn23xx_sriov_config (struct octeon_device *oct);Signature · 1 line
2.49.0
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Sun, 15 Jun 2025 00:49:41 +0100 you wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
[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 commit72c0091293c0("liquidio: CN23XX device init and sriov config")[...]
Here is the summary with links:
- [net-next] net: liquidio: Remove unused validate_cn23xx_pf_config_info()
https://git.kernel.org/netdev/net-next/c/5216b3b25018
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html