summaryrefslogtreecommitdiffstats
path: root/include/linux/device.h
diff options
context:
space:
mode:
authorThomas Gleixner2015-07-30 00:13:24 +0200
committerThomas Gleixner2015-07-30 00:13:24 +0200
commit4b979e4c611ce750d32b51737f837b485f43c69b (patch)
tree3bc56f2a22d2cf29bc183b67e74e1e8c0733efc0 /include/linux/device.h
parentxtensa/irq: Use access helper irq_data_get_affinity_mask() (diff)
parentLinux 4.2-rc4 (diff)
downloadkernel-qcow2-linux-4b979e4c611ce750d32b51737f837b485f43c69b.tar.gz
kernel-qcow2-linux-4b979e4c611ce750d32b51737f837b485f43c69b.tar.xz
kernel-qcow2-linux-4b979e4c611ce750d32b51737f837b485f43c69b.zip
Merge branch 'linus' into irq/core
Pull in upstream fixes before applying conflicting changes
Diffstat (limited to 'include/linux/device.h')
-rw-r--r--include/linux/device.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 22227e7fe463..3d3139ad5705 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -637,8 +637,9 @@ extern int devres_release_group(struct device *dev, void *id);
/* managed devm_k.alloc/kfree for device drivers */
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,
- va_list ap);
+extern __printf(3, 0)
+char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
+ va_list ap);
extern __printf(3, 4)
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)
@@ -1015,12 +1016,10 @@ extern int __must_check device_reprobe(struct device *dev);
/*
* Easy functions for dynamically creating devices on the fly
*/
-extern struct device *device_create_vargs(struct class *cls,
- struct device *parent,
- dev_t devt,
- void *drvdata,
- const char *fmt,
- va_list vargs);
+extern __printf(5, 0)
+struct device *device_create_vargs(struct class *cls, struct device *parent,
+ dev_t devt, void *drvdata,
+ const char *fmt, va_list vargs);
extern __printf(5, 6)
struct device *device_create(struct class *cls, struct device *parent,
dev_t devt, void *drvdata,