diff options
| author |   Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2022-04-19 13:34:30 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-22 17:13:54 +0200 |
| commit | 19368f0f23e80929691dd5b1354832c0e0494419 (patch) | |
| tree | b87e8f50efaecec2a5fb7619d261925e5bdc3365 /drivers/spi/spi.c | |
| parent | s390/cio: Use driver_set_override() instead of open-coding (diff) | |
| download | linux-dev-19368f0f23e80929691dd5b1354832c0e0494419.tar.xz linux-dev-19368f0f23e80929691dd5b1354832c0e0494419.zip | |
spi: Use helper for safer setting of driver_override
Use a helper to set driver_override to the reduce amount of duplicated
code.
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220419113435.246203-8-krzysztof.kozlowski@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 2e6d6bbeb784..1bbfb57d687a 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -71,29 +71,11 @@ static ssize_t driver_override_store(struct device *dev, const char *buf, size_t count) { struct spi_device *spi = to_spi_device(dev); - const char *end = memchr(buf, '\n', count); - const size_t len = end ? end - buf : count; - const char *driver_override, *old; - - /* We need to keep extra room for a newline when displaying value */ - if (len >= (PAGE_SIZE - 1)) - return -EINVAL; - - driver_override = kstrndup(buf, len, GFP_KERNEL); - if (!driver_override) - return -ENOMEM; + int ret; - device_lock(dev); - old = spi->driver_override; - if (len) { - spi->driver_override = driver_override; - } else { - /* Empty string, disable driver override */ - spi->driver_override = NULL; - kfree(driver_override); - } - device_unlock(dev); - kfree(old); + ret = driver_set_override(dev, &spi->driver_override, buf, count); + if (ret) + return ret; return count; } |