[linux-nvme:nvme-6.2 26/41] drivers/nvme/host/core.c:5122:6: error: assigning to 'int' from incompatible type 'void'

[Sagi Grimberg]

> tree:   git://git.infradead.org/nvme.git nvme-6.2
> head:   e2deb6d1a5b2dcff71f429a64fb516186aa0382c
> commit: c1658b482f1bec9ebafa49eec69a29aebbc23556 [26/41] nvme-auth: don't ignore key generation failures when initializing ctrl keys
> config: i386-randconfig-a016-20221114
> compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
> reproduce (this is a W=1 build):
>          wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
>          chmod +x ~/bin/make.cross
>          git remote add linux-nvme git://git.infradead.org/nvme.git
>          git fetch --no-tags linux-nvme nvme-6.2
>          git checkout c1658b482f1bec9ebafa49eec69a29aebbc23556
>          # save the config file
>          mkdir build_dir && cp config build_dir/.config
>          COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash
> 
> If you fix the issue, kindly add following tag where applicable
> | Reported-by: kernel test robot <lkp at intel.com>
> 
> All errors (new ones prefixed by >>):
> 
>>> drivers/nvme/host/core.c:5122:6: error: assigning to 'int' from incompatible type 'void'
>             ret = nvme_auth_init_ctrl(ctrl);

Christoph,

Can you fold this into the offending commit please?
--
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index a50b0743728e..273f4f95f425 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -1063,7 +1063,7 @@ static inline int nvme_init_auth(void)
         return 0;
  }
  static inline void nvme_exit_auth(void) {};
-static inline void nvme_auth_init_ctrl(struct nvme_ctrl *ctrl) {};
+static inline int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl) {};
  static inline void nvme_auth_stop(struct nvme_ctrl *ctrl) {};
  static inline int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid)
  {
--

If not, I can send a patch to fold in.