lkml.org 
[lkml]   [2022]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 07/11] spi: Use helper for safer setting of driver_override
    Date
    Use a helper to set driver_override to the reduce amount of duplicated
    code.

    Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
    Reviewed-by: Mark Brown <broonie@kernel.org>
    ---
    drivers/spi/spi.c | 26 ++++----------------------
    include/linux/spi/spi.h | 2 ++
    2 files changed, 6 insertions(+), 22 deletions(-)

    diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
    index 6937cf2d59e0..34f311224c47 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;
    }
    diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
    index 5f8c063ddff4..f0177f9b6e13 100644
    --- a/include/linux/spi/spi.h
    +++ b/include/linux/spi/spi.h
    @@ -138,6 +138,8 @@ extern int spi_delay_exec(struct spi_delay *_delay, struct spi_transfer *xfer);
    * for driver coldplugging, and in uevents used for hotplugging
    * @driver_override: If the name of a driver is written to this attribute, then
    * the device will bind to the named driver and only the named driver.
    + * Do not set directly, because core frees it; use driver_set_override() to
    + * set or clear it.
    * @cs_gpiod: gpio descriptor of the chipselect line (optional, NULL when
    * not using a GPIO line)
    * @word_delay: delay to be inserted between consecutive
    --
    2.32.0
    \
     
     \ /
      Last update: 2022-03-16 16:11    [W:2.890 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site