projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'asoc/topic/pcm5102a' into asoc-next
[linux-2.6-block.git]
/
drivers
/
infiniband
/
hw
/
mlx5
/
main.c
diff --git
a/drivers/infiniband/hw/mlx5/main.c
b/drivers/infiniband/hw/mlx5/main.c
index 033b6af90de9eeacffba3a4f9ca7293d557eb8b5..da091de4e69d81eda73de4e3ce758830aaa1413c 100644
(file)
--- a/
drivers/infiniband/hw/mlx5/main.c
+++ b/
drivers/infiniband/hw/mlx5/main.c
@@
-4860,19
+4860,19
@@
static int mlx5_ib_stage_ib_reg_init(struct mlx5_ib_dev *dev)
return ib_register_device(&dev->ib_dev, NULL);
}
return ib_register_device(&dev->ib_dev, NULL);
}
-static void mlx5_ib_stage_
ib_reg
_cleanup(struct mlx5_ib_dev *dev)
+static void mlx5_ib_stage_
pre_ib_reg_umr
_cleanup(struct mlx5_ib_dev *dev)
{
{
-
ib_unregister_device(&dev->ib_
dev);
+
destroy_umrc_res(
dev);
}
}
-static
int mlx5_ib_stage_umr_res_init
(struct mlx5_ib_dev *dev)
+static
void mlx5_ib_stage_ib_reg_cleanup
(struct mlx5_ib_dev *dev)
{
{
-
return create_umr_res(
dev);
+
ib_unregister_device(&dev->ib_
dev);
}
}
-static
void mlx5_ib_stage_umr_res_cleanup
(struct mlx5_ib_dev *dev)
+static
int mlx5_ib_stage_post_ib_reg_umr_init
(struct mlx5_ib_dev *dev)
{
{
-
destroy_umrc
_res(dev);
+
return create_umr
_res(dev);
}
static int mlx5_ib_stage_delay_drop_init(struct mlx5_ib_dev *dev)
}
static int mlx5_ib_stage_delay_drop_init(struct mlx5_ib_dev *dev)
@@
-4982,12
+4982,15
@@
static const struct mlx5_ib_profile pf_profile = {
STAGE_CREATE(MLX5_IB_STAGE_BFREG,
mlx5_ib_stage_bfrag_init,
mlx5_ib_stage_bfrag_cleanup),
STAGE_CREATE(MLX5_IB_STAGE_BFREG,
mlx5_ib_stage_bfrag_init,
mlx5_ib_stage_bfrag_cleanup),
+ STAGE_CREATE(MLX5_IB_STAGE_PRE_IB_REG_UMR,
+ NULL,
+ mlx5_ib_stage_pre_ib_reg_umr_cleanup),
STAGE_CREATE(MLX5_IB_STAGE_IB_REG,
mlx5_ib_stage_ib_reg_init,
mlx5_ib_stage_ib_reg_cleanup),
STAGE_CREATE(MLX5_IB_STAGE_IB_REG,
mlx5_ib_stage_ib_reg_init,
mlx5_ib_stage_ib_reg_cleanup),
- STAGE_CREATE(MLX5_IB_STAGE_
UMR_RESOURCES
,
- mlx5_ib_stage_
umr_res
_init,
-
mlx5_ib_stage_umr_res_cleanup
),
+ STAGE_CREATE(MLX5_IB_STAGE_
POST_IB_REG_UMR
,
+ mlx5_ib_stage_
post_ib_reg_umr
_init,
+
NULL
),
STAGE_CREATE(MLX5_IB_STAGE_DELAY_DROP,
mlx5_ib_stage_delay_drop_init,
mlx5_ib_stage_delay_drop_cleanup),
STAGE_CREATE(MLX5_IB_STAGE_DELAY_DROP,
mlx5_ib_stage_delay_drop_init,
mlx5_ib_stage_delay_drop_cleanup),