Commit 7f146b24 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Stephen Boyd
Browse files

driver core: Replace kstrdup() + strreplace() with kstrdup_and_replace() 



Replace open coded functionality of kstrdup_and_replace() with a call.

Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230804143910.15504-3-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 045ad464

drivers/base/core.c

+2 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/kstrtox.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/kdev_t.h>

#include <linux/notifier.h>

#include <linux/of.h>
@@ -28,6 +27,7 @@ 
#include <linux/netdevice.h>

#include <linux/sched/signal.h>

#include <linux/sched/mm.h>

#include <linux/string_helpers.h>

#include <linux/swiotlb.h>

#include <linux/sysfs.h>

#include <linux/dma-map-ops.h> /* for dma_default_coherent */
@@ -3910,10 +3910,9 @@ const char *device_get_devnode(const struct device *dev, 
		return dev_name(dev);



	/* replace '!' in the name with '/' */

	s = kstrdup(dev_name(dev), GFP_KERNEL);

	s = kstrdup_and_replace(dev_name(dev), '!', '/', GFP_KERNEL);

	if (!s)

		return NULL;

	strreplace(s, '!', '/');

	return *tmp = s;

}