mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220419113435.246203-3-krzysztof.kozlowski@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Krzysztof Kozlowski 2022-04-19 13:34:25 +02:00 committed by Greg Kroah-Hartman
parent 6c2f421174
commit 6e67955087
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/amba/bus.c
View File

@ -94,31 +94,11 @@ static ssize_t driver_override_store(struct device *_dev,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct amba_device *dev = to_amba_device(_dev); struct amba_device *dev = to_amba_device(_dev);
char *driver_override, *old, *cp; int ret;
/* We need to keep extra room for a newline */ ret = driver_set_override(_dev, &dev->driver_override, buf, count);
if (count >= (PAGE_SIZE - 1)) if (ret)
return -EINVAL; return ret;
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);
kfree(old);
return count; return count;
} }

6
include/linux/amba/bus.h
View File

@ -70,7 +70,11 @@ struct amba_device {
unsigned int cid; unsigned int cid;
struct amba_cs_uci_id uci; struct amba_cs_uci_id uci;
unsigned int irq[AMBA_NR_IRQS]; 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 { struct amba_driver {