dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Bluetooth: convert net/bluetooth/ to kstrtox 

Convert from strict_strto*() interfaces to kstrto*() interfaces.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Alexey Dobriyan 2011-04-02 14:19:41 +03:00 committed by Gustavo F. Padovan
parent e63a15ec0f
commit db940cb0db
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
net/bluetooth/hci_sysfs.c
View File

@ -277,10 +277,12 @@ static ssize_t show_idle_timeout(struct device *dev, struct device_attribute *at
static ssize_t store_idle_timeout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{
struct hci_dev *hdev = dev_get_drvdata(dev);
unsigned long val;
unsigned int val;
int rv;
if (strict_strtoul(buf, 0, &val) < 0)
return -EINVAL;
rv = kstrtouint(buf, 0, &val);
if (rv < 0)
return rv;
if (val != 0 && (val < 500 || val > 3600000))
return -EINVAL;
@ -299,15 +301,14 @@ static ssize_t show_sniff_max_interval(struct device *dev, struct device_attribu
static ssize_t store_sniff_max_interval(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{
struct hci_dev *hdev = dev_get_drvdata(dev);
unsigned long val;
u16 val;
int rv;
if (strict_strtoul(buf, 0, &val) < 0)
return -EINVAL;
rv = kstrtou16(buf, 0, &val);
if (rv < 0)
return rv;
if (val < 0x0002 || val > 0xFFFE || val % 2)
return -EINVAL;
if (val < hdev->sniff_min_interval)
if (val == 0 || val % 2 || val < hdev->sniff_min_interval)
return -EINVAL;
hdev->sniff_max_interval = val;
@ -324,15 +325,14 @@ static ssize_t show_sniff_min_interval(struct device *dev, struct device_attribu
static ssize_t store_sniff_min_interval(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{
struct hci_dev *hdev = dev_get_drvdata(dev);
unsigned long val;
u16 val;
int rv;
if (strict_strtoul(buf, 0, &val) < 0)
return -EINVAL;
rv = kstrtou16(buf, 0, &val);
if (rv < 0)
return rv;
if (val < 0x0002 || val > 0xFFFE || val % 2)
return -EINVAL;
if (val > hdev->sniff_max_interval)
if (val == 0 || val % 2 || val > hdev->sniff_max_interval)
return -EINVAL;
hdev->sniff_min_interval = val;