Commit 6e679550 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

amba: Use driver_set_override() instead of open-coding 



Use a helper to set driver_override to reduce the amount of duplicated
code.  Make the driver_override field const char, because it is not
modified by the core and it matches other subsystems.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220419113435.246203-3-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6c2f4211

drivers/amba/bus.c

+4 −24
Original line number Diff line number Diff line
@@ -94,31 +94,11 @@ static ssize_t driver_override_store(struct device *_dev, 
				     const char *buf, size_t count)

{

	struct amba_device *dev = to_amba_device(_dev);

	char *driver_override, *old, *cp;



	/* We need to keep extra room for a newline */

	if (count >= (PAGE_SIZE - 1))

		return -EINVAL;



	driver_override = kstrndup(buf, count, GFP_KERNEL);

	if (!driver_override)

		return -ENOMEM;



	cp = strchr(driver_override, '\n');

	if (cp)

		*cp = '\0';



	device_lock(_dev);

	old = dev->driver_override;

	if (strlen(driver_override)) {

		dev->driver_override = driver_override;

	} else {

		kfree(driver_override);

		dev->driver_override = NULL;

	}

	device_unlock(_dev);

	int ret;



	kfree(old);

	ret = driver_set_override(_dev, &dev->driver_override, buf, count);

	if (ret)

		return ret;



	return count;

}

include/linux/amba/bus.h

+5 −1
Original line number Diff line number Diff line
@@ -70,7 +70,11 @@ struct amba_device { 
	unsigned int		cid;

	struct amba_cs_uci_id	uci;

	unsigned int		irq[AMBA_NR_IRQS];

	char			*driver_override;

	/*

	 * Driver name to force a match.  Do not set directly, because core

	 * frees it.  Use driver_set_override() to set or clear it.

	 */

	const char		*driver_override;

};



struct amba_driver {