]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
pktcdvd: replace sscanf() by kstrtoul()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 10 Mar 2023 16:45:42 +0000 (18:45 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 7 Jun 2023 20:26:32 +0000 (14:26 -0600)
The checkpatch.pl warns: "Prefer kstrto<type> to single variable sscanf".
Fix the code accordingly.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230310164549.22133-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/pktcdvd.c

index a327cce677686a27b18bdc251f201c9d48263866..488d03dc51520e4669470bae36aceea54ab6f964 100644 (file)
@@ -237,15 +237,16 @@ static ssize_t congestion_off_store(struct device *dev,
                                    const char *buf, size_t len)
 {
        struct pktcdvd_device *pd = dev_get_drvdata(dev);
-       int val;
+       int val, ret;
 
-       if (sscanf(buf, "%d", &val) == 1) {
-               spin_lock(&pd->lock);
-               pd->write_congestion_off = val;
-               init_write_congestion_marks(&pd->write_congestion_off,
-                                       &pd->write_congestion_on);
-               spin_unlock(&pd->lock);
-       }
+       ret = kstrtoint(buf, 10, &val);
+       if (ret)
+               return ret;
+
+       spin_lock(&pd->lock);
+       pd->write_congestion_off = val;
+       init_write_congestion_marks(&pd->write_congestion_off, &pd->write_congestion_on);
+       spin_unlock(&pd->lock);
        return len;
 }
 static DEVICE_ATTR_RW(congestion_off);
@@ -267,15 +268,16 @@ static ssize_t congestion_on_store(struct device *dev,
                                   const char *buf, size_t len)
 {
        struct pktcdvd_device *pd = dev_get_drvdata(dev);
-       int val;
+       int val, ret;
 
-       if (sscanf(buf, "%d", &val) == 1) {
-               spin_lock(&pd->lock);
-               pd->write_congestion_on = val;
-               init_write_congestion_marks(&pd->write_congestion_off,
-                                       &pd->write_congestion_on);
-               spin_unlock(&pd->lock);
-       }
+       ret = kstrtoint(buf, 10, &val);
+       if (ret)
+               return ret;
+
+       spin_lock(&pd->lock);
+       pd->write_congestion_on = val;
+       init_write_congestion_marks(&pd->write_congestion_off, &pd->write_congestion_on);
+       spin_unlock(&pd->lock);
        return len;
 }
 static DEVICE_ATTR_RW(congestion_on);