Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...

[thirdparty/linux.git] / include / linux / mlx5 / driver.h

diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 44bf95d6367763acd1d574ae1b97d30326615788..d143b8bd55c9012f186b55b551d10d66d90c5959 100644 (file)
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -575,10 +575,6 @@ struct mlx5_priv {
        /* end: alloc staff */
        struct dentry          *dbg_root;
 
-       /* protect mkey key part */
-       spinlock_t              mkey_lock;
-       u8                      mkey_key;
-
        struct list_head        dev_list;
        struct list_head        ctx_list;
        spinlock_t              ctx_lock;
@@ -948,12 +944,6 @@ struct mlx5_cmd_mailbox *mlx5_alloc_cmd_mailbox_chain(struct mlx5_core_dev *dev,
                                                      gfp_t flags, int npages);
 void mlx5_free_cmd_mailbox_chain(struct mlx5_core_dev *dev,
                                 struct mlx5_cmd_mailbox *head);
-int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev,
-                            struct mlx5_core_mkey *mkey,
-                            struct mlx5_async_ctx *async_ctx, u32 *in,
-                            int inlen, u32 *out, int outlen,
-                            mlx5_async_cbk_t callback,
-                            struct mlx5_async_work *context);
 int mlx5_core_create_mkey(struct mlx5_core_dev *dev,
                          struct mlx5_core_mkey *mkey,
                          u32 *in, int inlen);