Skip to content

Commit 0013522

Browse files
committed
Merge branch 'devlink-delete-publidh-api'
Leon Romanovsky says: ==================== devlink: Delete publish of single parameter API This short series removes the single parameter publish/unpublish API that does nothing expect mimics already existing devlink_paramss_*publish calls. In near future, we will be able to delete devlink_paramss_*publish too. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents dc50b93 + c2d2f98 commit 0013522

File tree

3 files changed

+2
-60
lines changed

3 files changed

+2
-60
lines changed

drivers/net/ethernet/mellanox/mlx5/core/devlink.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,6 @@ static int mlx5_devlink_eth_param_register(struct devlink *devlink)
625625
devlink_param_driverinit_value_set(devlink,
626626
DEVLINK_PARAM_GENERIC_ID_ENABLE_ETH,
627627
value);
628-
devlink_param_publish(devlink, &enable_eth_param);
629628
return 0;
630629
}
631630

@@ -636,7 +635,6 @@ static void mlx5_devlink_eth_param_unregister(struct devlink *devlink)
636635
if (!mlx5_eth_supported(dev))
637636
return;
638637

639-
devlink_param_unpublish(devlink, &enable_eth_param);
640638
devlink_param_unregister(devlink, &enable_eth_param);
641639
}
642640

@@ -673,7 +671,6 @@ static int mlx5_devlink_rdma_param_register(struct devlink *devlink)
673671
devlink_param_driverinit_value_set(devlink,
674672
DEVLINK_PARAM_GENERIC_ID_ENABLE_RDMA,
675673
value);
676-
devlink_param_publish(devlink, &enable_rdma_param);
677674
return 0;
678675
}
679676

@@ -684,7 +681,6 @@ static void mlx5_devlink_rdma_param_unregister(struct devlink *devlink)
684681
if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND) || MLX5_ESWITCH_MANAGER(dev))
685682
return;
686683

687-
devlink_param_unpublish(devlink, &enable_rdma_param);
688684
devlink_param_unregister(devlink, &enable_rdma_param);
689685
}
690686

@@ -709,7 +705,6 @@ static int mlx5_devlink_vnet_param_register(struct devlink *devlink)
709705
devlink_param_driverinit_value_set(devlink,
710706
DEVLINK_PARAM_GENERIC_ID_ENABLE_VNET,
711707
value);
712-
devlink_param_publish(devlink, &enable_rdma_param);
713708
return 0;
714709
}
715710

@@ -720,7 +715,6 @@ static void mlx5_devlink_vnet_param_unregister(struct devlink *devlink)
720715
if (!mlx5_vnet_supported(dev))
721716
return;
722717

723-
devlink_param_unpublish(devlink, &enable_vnet_param);
724718
devlink_param_unregister(devlink, &enable_vnet_param);
725719
}
726720

@@ -811,7 +805,6 @@ int mlx5_devlink_register(struct devlink *devlink)
811805
if (err)
812806
goto params_reg_err;
813807
mlx5_devlink_set_params_init_values(devlink);
814-
devlink_params_publish(devlink);
815808

816809
err = mlx5_devlink_auxdev_params_register(devlink);
817810
if (err)
@@ -821,6 +814,7 @@ int mlx5_devlink_register(struct devlink *devlink)
821814
if (err)
822815
goto traps_reg_err;
823816

817+
devlink_params_publish(devlink);
824818
return 0;
825819

826820
traps_reg_err:
@@ -835,9 +829,9 @@ int mlx5_devlink_register(struct devlink *devlink)
835829

836830
void mlx5_devlink_unregister(struct devlink *devlink)
837831
{
832+
devlink_params_unpublish(devlink);
838833
mlx5_devlink_traps_unregister(devlink);
839834
mlx5_devlink_auxdev_params_unregister(devlink);
840-
devlink_params_unpublish(devlink);
841835
devlink_params_unregister(devlink, mlx5_devlink_params,
842836
ARRAY_SIZE(mlx5_devlink_params));
843837
devlink_unregister(devlink);

include/net/devlink.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,10 +1653,6 @@ void devlink_param_unregister(struct devlink *devlink,
16531653
const struct devlink_param *param);
16541654
void devlink_params_publish(struct devlink *devlink);
16551655
void devlink_params_unpublish(struct devlink *devlink);
1656-
void devlink_param_publish(struct devlink *devlink,
1657-
const struct devlink_param *param);
1658-
void devlink_param_unpublish(struct devlink *devlink,
1659-
const struct devlink_param *param);
16601656
int devlink_port_params_register(struct devlink_port *devlink_port,
16611657
const struct devlink_param *params,
16621658
size_t params_count);

net/core/devlink.c

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10121,54 +10121,6 @@ void devlink_params_unpublish(struct devlink *devlink)
1012110121
}
1012210122
EXPORT_SYMBOL_GPL(devlink_params_unpublish);
1012310123

10124-
/**
10125-
* devlink_param_publish - publish one configuration parameter
10126-
*
10127-
* @devlink: devlink
10128-
* @param: one configuration parameter
10129-
*
10130-
* Publish previously registered configuration parameter.
10131-
*/
10132-
void devlink_param_publish(struct devlink *devlink,
10133-
const struct devlink_param *param)
10134-
{
10135-
struct devlink_param_item *param_item;
10136-
10137-
list_for_each_entry(param_item, &devlink->param_list, list) {
10138-
if (param_item->param != param || param_item->published)
10139-
continue;
10140-
param_item->published = true;
10141-
devlink_param_notify(devlink, 0, param_item,
10142-
DEVLINK_CMD_PARAM_NEW);
10143-
break;
10144-
}
10145-
}
10146-
EXPORT_SYMBOL_GPL(devlink_param_publish);
10147-
10148-
/**
10149-
* devlink_param_unpublish - unpublish one configuration parameter
10150-
*
10151-
* @devlink: devlink
10152-
* @param: one configuration parameter
10153-
*
10154-
* Unpublish previously registered configuration parameter.
10155-
*/
10156-
void devlink_param_unpublish(struct devlink *devlink,
10157-
const struct devlink_param *param)
10158-
{
10159-
struct devlink_param_item *param_item;
10160-
10161-
list_for_each_entry(param_item, &devlink->param_list, list) {
10162-
if (param_item->param != param || !param_item->published)
10163-
continue;
10164-
param_item->published = false;
10165-
devlink_param_notify(devlink, 0, param_item,
10166-
DEVLINK_CMD_PARAM_DEL);
10167-
break;
10168-
}
10169-
}
10170-
EXPORT_SYMBOL_GPL(devlink_param_unpublish);
10171-
1017210124
/**
1017310125
* devlink_port_params_register - register port configuration parameters
1017410126
*

0 commit comments

Comments
 (0)