nvme: use kstrtobool() instead of strtobool()

strtobool() is the same as kstrtobool().
However, the latter is more used within the kernel.

In order to remove strtobool() and slightly simplify kstrtox.h, switch to
the other function name.

While at it, include the corresponding header file (<linux/kstrtox.h>)

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index bd5fcdc9211cabe636679d5379e75c4c95f31391..e0da4a6719a7525768dee0d5bb0b5b61988f37e6 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/kstrtox.h>
 #include <linux/memremap.h>
 #include <linux/mm.h>
 #include <linux/module.h>
@@ -2184,7 +2185,7 @@ static ssize_t hmb_store(struct device *dev, struct device_attribute *attr,
        bool new;
        int ret;
 
-       if (strtobool(buf, &new) < 0)
+       if (kstrtobool(buf, &new) < 0)
                return -EINVAL;
 
        if (new == ndev->hmb)

diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c
index d48deb9bdb278a37f0cd8812d514bc3a75cef353..682d88e5e43ae3fcff875c9eedc062f03bae7a1f 100644 (file)
--- a/drivers/nvme/target/configfs.c
+++ b/drivers/nvme/target/configfs.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2015-2016 HGST, a Western Digital Company.
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/kstrtox.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -267,7 +268,7 @@ static ssize_t nvmet_param_pi_enable_store(struct config_item *item,
        struct nvmet_port *port = to_nvmet_port(item);
        bool val;
 
-       if (strtobool(page, &val))
+       if (kstrtobool(page, &val))
                return -EINVAL;
 
        if (nvmet_is_port_enabled(port, __func__))
@@ -532,7 +533,7 @@ static ssize_t nvmet_ns_enable_store(struct config_item *item,
        bool enable;
        int ret = 0;
 
-       if (strtobool(page, &enable))
+       if (kstrtobool(page, &enable))
                return -EINVAL;
 
        if (enable)
@@ -556,7 +557,7 @@ static ssize_t nvmet_ns_buffered_io_store(struct config_item *item,
        struct nvmet_ns *ns = to_nvmet_ns(item);
        bool val;
 
-       if (strtobool(page, &val))
+       if (kstrtobool(page, &val))
                return -EINVAL;
 
        mutex_lock(&ns->subsys->lock);
@@ -579,7 +580,7 @@ static ssize_t nvmet_ns_revalidate_size_store(struct config_item *item,
        struct nvmet_ns *ns = to_nvmet_ns(item);
        bool val;
 
-       if (strtobool(page, &val))
+       if (kstrtobool(page, &val))
                return -EINVAL;
 
        if (!val)
@@ -728,7 +729,7 @@ static ssize_t nvmet_passthru_enable_store(struct config_item *item,
        bool enable;
        int ret = 0;
 
-       if (strtobool(page, &enable))
+       if (kstrtobool(page, &enable))
                return -EINVAL;
 
        if (enable)
@@ -995,7 +996,7 @@ static ssize_t nvmet_subsys_attr_allow_any_host_store(struct config_item *item,
        bool allow_any_host;
        int ret = 0;
 
-       if (strtobool(page, &allow_any_host))
+       if (kstrtobool(page, &allow_any_host))
                return -EINVAL;
 
        down_write(&nvmet_config_sem);
@@ -1382,7 +1383,7 @@ static ssize_t nvmet_subsys_attr_pi_enable_store(struct config_item *item,
        struct nvmet_subsys *subsys = to_subsys(item);
        bool pi_enable;
 
-       if (strtobool(page, &pi_enable))
+       if (kstrtobool(page, &pi_enable))
                return -EINVAL;
 
        subsys->pi_support = pi_enable;
@@ -1511,7 +1512,7 @@ static ssize_t nvmet_referral_enable_store(struct config_item *item,
        struct nvmet_port *port = to_nvmet_port(item);
        bool enable;
 
-       if (strtobool(page, &enable))
+       if (kstrtobool(page, &enable))
                goto inval;
 
        if (enable)