Skip to content

Commit 19368f0

Browse files
krzkgregkh
authored andcommitted
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>
1 parent 1e8ee51 commit 19368f0

File tree

2 files changed

+6
-22
lines changed

2 files changed

+6
-22
lines changed

drivers/spi/spi.c

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -71,29 +71,11 @@ static ssize_t driver_override_store(struct device *dev,
7171
const char *buf, size_t count)
7272
{
7373
struct spi_device *spi = to_spi_device(dev);
74-
const char *end = memchr(buf, '\n', count);
75-
const size_t len = end ? end - buf : count;
76-
const char *driver_override, *old;
77-
78-
/* We need to keep extra room for a newline when displaying value */
79-
if (len >= (PAGE_SIZE - 1))
80-
return -EINVAL;
81-
82-
driver_override = kstrndup(buf, len, GFP_KERNEL);
83-
if (!driver_override)
84-
return -ENOMEM;
74+
int ret;
8575

86-
device_lock(dev);
87-
old = spi->driver_override;
88-
if (len) {
89-
spi->driver_override = driver_override;
90-
} else {
91-
/* Empty string, disable driver override */
92-
spi->driver_override = NULL;
93-
kfree(driver_override);
94-
}
95-
device_unlock(dev);
96-
kfree(old);
76+
ret = driver_set_override(dev, &spi->driver_override, buf, count);
77+
if (ret)
78+
return ret;
9779

9880
return count;
9981
}

include/linux/spi/spi.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ extern int spi_delay_exec(struct spi_delay *_delay, struct spi_transfer *xfer);
138138
* for driver coldplugging, and in uevents used for hotplugging
139139
* @driver_override: If the name of a driver is written to this attribute, then
140140
* the device will bind to the named driver and only the named driver.
141+
* Do not set directly, because core frees it; use driver_set_override() to
142+
* set or clear it.
141143
* @cs_gpiod: gpio descriptor of the chipselect line (optional, NULL when
142144
* not using a GPIO line)
143145
* @word_delay: delay to be inserted between consecutive

0 commit comments

Comments
 (0)