Skip to contentSkip to conversation

driver core: simplify __device_set_driver_override() clearing logic

PATCH In review Gui-Dong Han 2 participants 2 messages Mar 25 – Mar 30 Driver core

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 driver core: simplify __device_set_driver_override() clearing logic

Currently, __device_set_driver_override() handles clearing the override via empty string ("") and newline ("\n") in two separate paths. The "\n" case also performs an unnecessary memory allocation and immediate free.

Simplify the logic by initializing 'new' to NULL and only allocating memory if the string length remains non-zero after stripping the trailing newline.

Reduce code size, improve readability, and avoid unnecessary memory operations.

No functional change intended.

---
 drivers/base/dd.c | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)
drivers/base/dd.c +16 -27
index 37c7e54e0e4c..1a8f93051470 100644
@@ -383,7 +383,7 @@ __exitcall(deferred_probe_exit);
 
 int __device_set_driver_override(struct device *dev, const char *s, size_t len)
 {
-	const char *new, *old;
+	const char *new = NULL, *old;
 	char *cp;
 
 	if (!s)
@@ -404,37 +404,26 @@ int __device_set_driver_override(struct device *dev, const char *s, size_t len)
 	 */
 	len = strlen(s);
 
-	if (!len) {
-		/* Empty string passed - clear override */
-		spin_lock(&dev->driver_override.lock);
-		old = dev->driver_override.name;
-		dev->driver_override.name = NULL;
-		spin_unlock(&dev->driver_override.lock);
-		kfree(old);
-
-		return 0;
+	/* Handle trailing newline */
+	if (len) {
+		cp = strnchr(s, len, '\n');
+		if (cp)
+			len = cp - s;
 	}
 
-	cp = strnchr(s, len, '\n');
-	if (cp)
-		len = cp - s;
-
-	new = kstrndup(s, len, GFP_KERNEL);
-	if (!new)
-		return -ENOMEM;
+	/* If empty string or "\n" passed, new remains NULL, clearing
+	 * the driver_override.name.
+	 */
+	if (len) {
+		new = kstrndup(s, len, GFP_KERNEL);
+		if (!new)
+			return -ENOMEM;
+	}
 
 	spin_lock(&dev->driver_override.lock);
 	old = dev->driver_override.name;
-	if (cp != s) {
-		dev->driver_override.name = new;
-		spin_unlock(&dev->driver_override.lock);
-	} else {
-		/* "\n" passed - clear override */
-		dev->driver_override.name = NULL;
-		spin_unlock(&dev->driver_override.lock);
-
-		kfree(new);
-	}
+	dev->driver_override.name = new;
+	spin_unlock(&dev->driver_override.lock);
 	kfree(old);
 
 	return 0;
Signature · 1 line
2.43.0
maintainer
#1 lore raw
Quoted 8 lines · Gui-Dong Han

Currently, __device_set_driver_override() handles clearing the override via empty string ("") and newline ("\n") in two separate paths. The "\n" case also performs an unnecessary memory allocation and immediate free.

Simplify the logic by initializing 'new' to NULL and only allocating memory if the string length remains non-zero after stripping the trailing newline.

Quoted 8 lines

Reduce code size, improve readability, and avoid unnecessary memory operations.

No functional change intended.

Applied to driver-core-testing, thanks!

[ Narrow cp's scope to the newline handling block; use scoped_guard().
- Danilo ]