Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3b1b0b0 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: mark shutdown_timeout static 



And open code the SHUTDOWN_TIMEOUT macro.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent bb472baa

drivers/nvme/host/core.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ module_param_named(io_timeout, nvme_io_timeout, byte, 0644); 
MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");

EXPORT_SYMBOL_GPL(nvme_io_timeout);



unsigned char shutdown_timeout = 5;

static unsigned char shutdown_timeout = 5;

module_param(shutdown_timeout, byte, 0644);

MODULE_PARM_DESC(shutdown_timeout, "timeout in seconds for controller shutdown");
@@ -1357,7 +1357,7 @@ EXPORT_SYMBOL_GPL(nvme_enable_ctrl); 


int nvme_shutdown_ctrl(struct nvme_ctrl *ctrl)

{

	unsigned long timeout = SHUTDOWN_TIMEOUT + jiffies;

	unsigned long timeout = jiffies + (shutdown_timeout * HZ);

	u32 csts;

	int ret;

drivers/nvme/host/nvme.h

+0 −3
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ extern unsigned char nvme_io_timeout; 
extern unsigned char admin_timeout;

#define ADMIN_TIMEOUT	(admin_timeout * HZ)



extern unsigned char shutdown_timeout;

#define SHUTDOWN_TIMEOUT	(shutdown_timeout * HZ)



#define NVME_DEFAULT_KATO	5

#define NVME_KATO_GRACE		10