Messages in this thread Patch in this message | | | From | Alexey Dobriyan <> | Subject | [PATCH 14/52] kstrtox: convert drivers/bluetooth/ | Date | Sat, 5 Feb 2011 16:20:17 +0200 |
| |
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> --- drivers/bluetooth/btmrvl_debugfs.c | 50 +++++++++++++++++------------------ 1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c index fd6305b..ffc4324 100644 --- a/drivers/bluetooth/btmrvl_debugfs.c +++ b/drivers/bluetooth/btmrvl_debugfs.c @@ -56,16 +56,16 @@ static ssize_t btmrvl_hscfgcmd_write(struct file *file, { struct btmrvl_private *priv = file->private_data; char buf[16]; - long result, ret; + int ret; memset(buf, 0, sizeof(buf)); if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) return -EFAULT; - ret = strict_strtol(buf, 10, &result); - - priv->btmrvl_dev.hscfgcmd = result; + ret = kstrtou8(buf, 10, &priv->btmrvl_dev.hscfgcmd); + if (ret < 0) + return ret; if (priv->btmrvl_dev.hscfgcmd) { btmrvl_prepare_command(priv); @@ -100,17 +100,16 @@ static ssize_t btmrvl_psmode_write(struct file *file, const char __user *ubuf, { struct btmrvl_private *priv = file->private_data; char buf[16]; - long result, ret; + int ret; memset(buf, 0, sizeof(buf)); if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) return -EFAULT; - ret = strict_strtol(buf, 10, &result); - - priv->btmrvl_dev.psmode = result; - + ret = kstrtou8(buf, 10, &priv->btmrvl_dev.psmode); + if (ret < 0) + return ret; return count; } @@ -139,16 +138,16 @@ static ssize_t btmrvl_pscmd_write(struct file *file, const char __user *ubuf, { struct btmrvl_private *priv = file->private_data; char buf[16]; - long result, ret; + int ret; memset(buf, 0, sizeof(buf)); if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) return -EFAULT; - ret = strict_strtol(buf, 10, &result); - - priv->btmrvl_dev.pscmd = result; + ret = kstrtou8(buf, 10, &priv->btmrvl_dev.pscmd); + if (ret < 0) + return ret; if (priv->btmrvl_dev.pscmd) { btmrvl_prepare_command(priv); @@ -183,17 +182,16 @@ static ssize_t btmrvl_gpiogap_write(struct file *file, const char __user *ubuf, { struct btmrvl_private *priv = file->private_data; char buf[16]; - long result, ret; + int ret; memset(buf, 0, sizeof(buf)); if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) return -EFAULT; - ret = strict_strtol(buf, 16, &result); - - priv->btmrvl_dev.gpio_gap = result; - + ret = kstrtou16(buf, 16, &priv->btmrvl_dev.gpio_gap); + if (ret < 0) + return ret; return count; } @@ -222,16 +220,17 @@ static ssize_t btmrvl_hscmd_write(struct file *file, const char __user *ubuf, { struct btmrvl_private *priv = file->private_data; char buf[16]; - long result, ret; + int ret; memset(buf, 0, sizeof(buf)); if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) return -EFAULT; - ret = strict_strtol(buf, 10, &result); + ret = kstrtou8(buf, 10, &priv->btmrvl_dev.hscmd); + if (ret < 0) + return ret; - priv->btmrvl_dev.hscmd = result; if (priv->btmrvl_dev.hscmd) { btmrvl_prepare_command(priv); wake_up_interruptible(&priv->main_thread.wait_q); @@ -264,17 +263,16 @@ static ssize_t btmrvl_hsmode_write(struct file *file, const char __user *ubuf, { struct btmrvl_private *priv = file->private_data; char buf[16]; - long result, ret; + int ret; memset(buf, 0, sizeof(buf)); if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) return -EFAULT; - ret = strict_strtol(buf, 10, &result); - - priv->btmrvl_dev.hsmode = result; - + ret = kstrtou8(buf, 10, &priv->btmrvl_dev.hsmode); + if (ret < 0) + return ret; return count; } -- 1.7.3.4
| |