From patchwork Fri Feb 2 03:00:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guan-Yu Lin X-Patchwork-Id: 769463 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1461FC2CD for ; Fri, 2 Feb 2024 03:04:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706843060; cv=none; b=aDtnnSGEs7G+hi8O81PxEVZE2mcfP+2P5/xpXoyvN1ps2fZGQ1McE37I2s37ZauvmjSUjItyOYlN+lY6lZ60KGsmxhr7ByKo/agK2yvvgTT3gvCo+Z2CxPXX7xuWfpoAiLpiCABqZaTuHX8Eq2pzPKSuf8V4p3xe4i0tDbKJbx0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706843060; c=relaxed/simple; bh=7fvoMDGLvlhYIzv6i+KgK8j9y8CMOHfEAGQsrvtQc14=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=KyL54jnp7GMzfoh/JtrAwrcTm543x9uRLyxVHnH7z2C7PqmQgvcZ/6fxjHaJE1lGHnNh/EWIcS7ePgC97tI+atiRXenU4thUd+2eSftJbrt0ZKMpvZgEZb+SW3TFwtOJHvvOJnKy9UqvLlIAgXagqvmRPMWJkmKMadKInV1OzzA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--guanyulin.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=A1qsG+aa; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--guanyulin.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="A1qsG+aa" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6c2643a07so2884833276.3 for ; Thu, 01 Feb 2024 19:04:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706843058; x=1707447858; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=NBFBnWt5PngE+9c3SBPlpOUFG8K2Vi64DLTgnygvKiw=; b=A1qsG+aagv8qJyA4r/IQdvg6N1KYFB2gEYWWTWbx4qc3OSsy5gZGqZea028rpsVy2I uVkpldcNp1VD1VGSJBPXhugZlnlVRGOkUqXKuMGqmWx58mHgm2Da/oP0KQojRShVo1l2 Dj1+iEUH2a6DUCsrqjtZJkObaBHYsX0pe9GgPuajsqYWAAG5Tnaq1tx2VKkwle/8UXdH DDCiW/+hrmAfdStbYkFA1LbXvCOXNqlpXkyTVFSx04jyMxpdb7o33DbFLOJhFr06UvBX Id9EAixwwTY8syaH0VZlKiNbp4aLnGIsZgxFBKupvs2WJ2UxxzcEvWoMP8a0I5Xdb7Wi sgMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706843058; x=1707447858; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=NBFBnWt5PngE+9c3SBPlpOUFG8K2Vi64DLTgnygvKiw=; b=Mj+rLDqnucQw0sQeQtG0jqMJpBTvCyLSYaMCZ9K9cLsEOOLwDRRgS8C2QaxyQi5bwz qxMPAQT5qPwM8ns2LhGR9qwzKdVktnfvP4Maxo6k0z4E3jjUjMhRuC4Ke+l1FufVNAqF HKY1PQCEyol3wQAyuG25RZR6vAcaZyHuozxfxiu23BGLeJ63bNbvY17q2TwHubisZ+fE HXxTeMY3h5A/QAvp6WohnP5BEvKeHKy9h8J3G+jFhk5ZKRTcPCPUaCixxzZGA8t1NLhu m7MflyHEw/y8lpEJyQaZ1r2jL4zvzoSDmSjebWjcZW5cSpBG8jdBen8AqCexbBFR3/qN OfKQ== X-Gm-Message-State: AOJu0YxUFanHvq4M3QI5EFDuOYutrMK084y21vNeUf4Bbhpl1XhkqaNK 69lc3aOJdUitSBCDedtBLGemJpA3Z0RGP5myFtvNEiN/h5DER+m8GXuIr4R0RNKBu5aJznSdajs f9qRqcG7/DyBsGA== X-Google-Smtp-Source: AGHT+IHbeop2+ti/vV4Op5SIW5t1qIc/jGyREI2vYL4SUKOUwJyT3jX7yAD8SnAY6YEPgN9Lwc6ekhMZeDtqhSE= X-Received: from guanyulin.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:1af]) (user=guanyulin job=sendgmr) by 2002:a05:6902:2491:b0:dc6:e8a7:fdba with SMTP id ds17-20020a056902249100b00dc6e8a7fdbamr391501ybb.4.1706843058023; Thu, 01 Feb 2024 19:04:18 -0800 (PST) Date: Fri, 2 Feb 2024 03:00:42 +0000 Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.594.gd9cf4e227d-goog Message-ID: <20240202030301.2396374-1-guanyulin@google.com> Subject: [PATCH] usb: sysfs: use kstrtobool() if possible From: Guan-Yu Lin To: gregkh@linuxfoundation.org, stern@rowland.harvard.edu, benjamin.tissoires@redhat.com, hadess@hadess.net Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Guan-Yu Lin Replace the self-rolled implementations with kstrtobool(). This reduces the maintenance efforts in the future. Signed-off-by: Guan-Yu Lin --- drivers/usb/core/sysfs.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index 5d21718afb05..e67826ec053e 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c @@ -273,9 +273,10 @@ static ssize_t avoid_reset_quirk_store(struct device *dev, const char *buf, size_t count) { struct usb_device *udev = to_usb_device(dev); - int val, rc; + bool val; + int rc; - if (sscanf(buf, "%d", &val) != 1 || val < 0 || val > 1) + if (kstrtobool(buf, &val) != 0) return -EINVAL; rc = usb_lock_device_interruptible(udev); if (rc < 0) @@ -322,13 +323,14 @@ static ssize_t persist_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct usb_device *udev = to_usb_device(dev); - int value, rc; + bool value; + int rc; /* Hubs are always enabled for USB_PERSIST */ if (udev->descriptor.bDeviceClass == USB_CLASS_HUB) return -EPERM; - if (sscanf(buf, "%d", &value) != 1) + if (kstrtobool(buf, &value) != 0) return -EINVAL; rc = usb_lock_device_interruptible(udev); @@ -739,14 +741,14 @@ static ssize_t authorized_store(struct device *dev, { ssize_t result; struct usb_device *usb_dev = to_usb_device(dev); - unsigned val; - result = sscanf(buf, "%u\n", &val); - if (result != 1) + bool val; + + if (kstrtobool(buf, &val) != 0) result = -EINVAL; - else if (val == 0) - result = usb_deauthorize_device(usb_dev); - else + else if (val) result = usb_authorize_device(usb_dev); + else + result = usb_deauthorize_device(usb_dev); return result < 0 ? result : size; } static DEVICE_ATTR_IGNORE_LOCKDEP(authorized, S_IRUGO | S_IWUSR,