Commit bef59c50 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman

devres: Improve devm_kasprintf()/kvasprintf() support

  - Add devm_kasprintf()/kvasprintf(), introduced by commit
    75f2a4ea ("devres: Add
    devm_kasprintf and devm_kvasprintf API"), to
    Documentation/driver-model/devres.txt,
  - Improve kernel doc: the string is not an existing formatted string,
    but is formatted into the newly-allocated buffer,
  - Add a __printf() annotation to devm_kasprintf(), so the compiler
    will verify the format string argument types.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 54270354
...@@ -293,12 +293,14 @@ MDIO ...@@ -293,12 +293,14 @@ MDIO
MEM MEM
devm_free_pages() devm_free_pages()
devm_get_free_pages() devm_get_free_pages()
devm_kasprintf()
devm_kcalloc() devm_kcalloc()
devm_kfree() devm_kfree()
devm_kmalloc() devm_kmalloc()
devm_kmalloc_array() devm_kmalloc_array()
devm_kmemdup() devm_kmemdup()
devm_kstrdup() devm_kstrdup()
devm_kvasprintf()
devm_kzalloc() devm_kzalloc()
PCI PCI
......
...@@ -817,13 +817,13 @@ char *devm_kstrdup(struct device *dev, const char *s, gfp_t gfp) ...@@ -817,13 +817,13 @@ char *devm_kstrdup(struct device *dev, const char *s, gfp_t gfp)
EXPORT_SYMBOL_GPL(devm_kstrdup); EXPORT_SYMBOL_GPL(devm_kstrdup);
/** /**
* devm_kvasprintf - Allocate resource managed space * devm_kvasprintf - Allocate resource managed space and format a string
* for the formatted string. * into that.
* @dev: Device to allocate memory for * @dev: Device to allocate memory for
* @gfp: the GFP mask used in the devm_kmalloc() call when * @gfp: the GFP mask used in the devm_kmalloc() call when
* allocating memory * allocating memory
* @fmt: the formatted string to duplicate * @fmt: The printf()-style format string
* @ap: the list of tokens to be placed in the formatted string * @ap: Arguments for the format string
* RETURNS: * RETURNS:
* Pointer to allocated string on success, NULL on failure. * Pointer to allocated string on success, NULL on failure.
*/ */
...@@ -849,12 +849,13 @@ char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt, ...@@ -849,12 +849,13 @@ char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
EXPORT_SYMBOL(devm_kvasprintf); EXPORT_SYMBOL(devm_kvasprintf);
/** /**
* devm_kasprintf - Allocate resource managed space * devm_kasprintf - Allocate resource managed space and format a string
* and copy an existing formatted string into that * into that.
* @dev: Device to allocate memory for * @dev: Device to allocate memory for
* @gfp: the GFP mask used in the devm_kmalloc() call when * @gfp: the GFP mask used in the devm_kmalloc() call when
* allocating memory * allocating memory
* @fmt: the string to duplicate * @fmt: The printf()-style format string
* @...: Arguments for the format string
* RETURNS: * RETURNS:
* Pointer to allocated string on success, NULL on failure. * Pointer to allocated string on success, NULL on failure.
*/ */
......
...@@ -607,8 +607,8 @@ extern int devres_release_group(struct device *dev, void *id); ...@@ -607,8 +607,8 @@ extern int devres_release_group(struct device *dev, void *id);
extern void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp); extern void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp);
extern char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt, extern char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
va_list ap); va_list ap);
extern char *devm_kasprintf(struct device *dev, gfp_t gfp, extern __printf(3, 4)
const char *fmt, ...); char *devm_kasprintf(struct device *dev, gfp_t gfp, const char *fmt, ...);
static inline void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp) static inline void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)
{ {
return devm_kmalloc(dev, size, gfp | __GFP_ZERO); return devm_kmalloc(dev, size, gfp | __GFP_ZERO);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment