Re: [40/52] kstrtox: convert drivers/usb/

[Michal Nazarewicz]

On Sat, 05 Feb 2011 15:20:43 +0100, Alexey Dobriyan <adobriyan@xxxxxxxxx>  
wrote:

> Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
>
> ---
> drivers/usb/gadget/storage_common.c |    7 ++++---

I haven't notice your patch (wasn't sent to linux-usb?) and changed this
file already -- patch is in Greg's tree.

>  drivers/usb/host/ehci-dbg.c         |    6 +++---
>  drivers/usb/serial/iuu_phoenix.c    |   27 ++++++++++-----------------
>  3 files changed, 17 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/usb/gadget/storage_common.c  
> b/drivers/usb/gadget/storage_common.c
> index b015561..ed81718 100644
> --- a/drivers/usb/gadget/storage_common.c
> +++ b/drivers/usb/gadget/storage_common.c
> @@ -713,8 +713,9 @@ static ssize_t fsg_store_ro(struct device *dev,  
> struct device_attribute *attr,
>  	struct rw_semaphore	*filesem = dev_get_drvdata(dev);
>  	unsigned long	ro;
> -	if (strict_strtoul(buf, 2, &ro))
> -		return -EINVAL;
> +	rc = kstrtoul(buf, 2, &ro);
> +	if (rc < 0)
> +		return rc;
> 	/*
>  	 * Allow the write-enable status to change only while the

Also, this is actually incorrect -- it zeroes rc which it should not
do.  I made the same mistake at first. ;)

> @@ -740,7 +741,7 @@ static ssize_t fsg_store_nofua(struct device *dev,
>  	struct fsg_lun	*curlun = fsg_lun_from_dev(dev);
>  	unsigned long	nofua;
> -	if (strict_strtoul(buf, 2, &nofua))
> +	if (kstrtoul(buf, 2, &nofua))
>  		return -EINVAL;
> 	/* Sync data when switching from async mode to sync */


> diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
> @@ -1000,7 +1000,7 @@ static ssize_t debug_lpm_write(struct file *file,  
> const char __user *user_buf,
>  		buf[len - 1] = '\0';
> 	if (strncmp(buf, "enable", 5) == 0) {
> -		if (strict_strtoul(buf + 7, 10, &port))
> +		if (kstrtoul(buf + 7, 10, &port))
>  			return -EINVAL;
>  		params = ehci_readl(ehci, &ehci->caps->hcs_params);
>  		if (port > HCS_N_PORTS(params)) {
> @@ -1018,7 +1018,7 @@ static ssize_t debug_lpm_write(struct file *file,  
> const char __user *user_buf,
>  		printk(KERN_INFO "force enable LPM for port %lu\n", port);
>  	} else if (strncmp(buf, "hird=", 5) == 0) {
>  		unsigned long hird;
> -		if (strict_strtoul(buf + 5, 16, &hird))
> +		if (kstrtoul(buf + 5, 16, &hird))
>  			return -EINVAL;
>  		printk(KERN_INFO "setting hird %s %lu\n", buf + 6, hird);
>  		temp = ehci_readl(ehci, &ehci->regs->command);
> @@ -1026,7 +1026,7 @@ static ssize_t debug_lpm_write(struct file *file,  
> const char __user *user_buf,
>  		temp |= hird << 24;
>  		ehci_writel(ehci, temp, &ehci->regs->command);
>  	} else if (strncmp(buf, "disable", 7) == 0) {
> -		if (strict_strtoul(buf + 8, 10, &port))
> +		if (kstrtoul(buf + 8, 10, &port))
>  			return -EINVAL;
>  		params = ehci_readl(ehci, &ehci->caps->hcs_params);
>  		if (port > HCS_N_PORTS(params)) {

I'm wondering if we care about loosing the possible -ERANGE.

--
Best regards,                                         _     _
.o. | Liege of Serenely Enlightened Majesty of      o' \,=./ `o
..o | Computer Science,  Michal "mina86" Nazarewicz    (o o)
ooo +-----<email/xmpp: mnazarewicz@xxxxxxxxxx>-----ooO--(_)--Ooo--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/