usb: gadget: storage_common: use kstrto*()
authorMichal Nazarewicz <mina86@mina86.com>
Wed, 13 Apr 2011 22:37:00 +0000 (00:37 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 14 Apr 2011 00:02:11 +0000 (17:02 -0700)
This commit replaces the usage of strict_strtoul() (which
became deprecated after commit 33ee3b2e) with kstrtouint().

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/gadget/storage_common.c

index 3179b8b..86fcebd 100644 (file)
@@ -704,10 +704,11 @@ static ssize_t fsg_store_ro(struct device *dev, struct device_attribute *attr,
        ssize_t         rc = count;
        struct fsg_lun  *curlun = fsg_lun_from_dev(dev);
        struct rw_semaphore     *filesem = dev_get_drvdata(dev);
-       unsigned long   ro;
+       unsigned        ro;
 
-       if (strict_strtoul(buf, 2, &ro))
-               return -EINVAL;
+       rc = kstrtouint(buf, 2, &ro);
+       if (rc)
+               return rc;
 
        /*
         * Allow the write-enable status to change only while the
@@ -731,10 +732,12 @@ static ssize_t fsg_store_nofua(struct device *dev,
                               const char *buf, size_t count)
 {
        struct fsg_lun  *curlun = fsg_lun_from_dev(dev);
-       unsigned long   nofua;
+       unsigned        nofua;
+       int             ret;
 
-       if (strict_strtoul(buf, 2, &nofua))
-               return -EINVAL;
+       ret = kstrtouint(buf, 2, &nofua);
+       if (ret)
+               return ret;
 
        /* Sync data when switching from async mode to sync */
        if (!nofua && curlun->nofua)