diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-08-06 08:59:00 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-16 18:14:09 -0400 |
commit | 43937455c9bf294cffc2f25c4a4d0a1b9bbd88e6 (patch) | |
tree | 304bcb684e8153f5238ced40683c0e7474c441b2 | |
parent | d64b472678e17ef9afb251577f4f544793483fa9 (diff) |
spi: rspi: Use devm_kasprintf()
Use the devm_kasprintf() helper function instead of open coding
error-prone buffer handling and string formatting.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | drivers/spi/spi-rspi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index a4d8d3cf2912..aa1c6a893570 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c | |||
@@ -1046,12 +1046,11 @@ static int rspi_request_irq(struct device *dev, unsigned int irq, | |||
1046 | irq_handler_t handler, const char *suffix, | 1046 | irq_handler_t handler, const char *suffix, |
1047 | void *dev_id) | 1047 | void *dev_id) |
1048 | { | 1048 | { |
1049 | const char *base = dev_name(dev); | 1049 | const char *name = devm_kasprintf(dev, GFP_KERNEL, "%s:%s", |
1050 | size_t len = strlen(base) + strlen(suffix) + 2; | 1050 | dev_name(dev), suffix); |
1051 | char *name = devm_kzalloc(dev, len, GFP_KERNEL); | ||
1052 | if (!name) | 1051 | if (!name) |
1053 | return -ENOMEM; | 1052 | return -ENOMEM; |
1054 | snprintf(name, len, "%s:%s", base, suffix); | 1053 | |
1055 | return devm_request_irq(dev, irq, handler, 0, name, dev_id); | 1054 | return devm_request_irq(dev, irq, handler, 0, name, dev_id); |
1056 | } | 1055 | } |
1057 | 1056 | ||