Standardize the style for compiler based printf format verification. Standardized the location of __printf too. Done via script and a little typing. $ grep -rPl --include=*.[ch] -w "__attribute__" * | \ grep -vP "^(tools|scripts|include/linux/compiler-gcc.h)" | \ xargs perl -n -i -e 'local $/; while (<>) { s/\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf\s*,\s*(.+)\s*,\s*(.+)\s*\)\s*\)\s*\)/__printf($1, $2)/g ; print; }' [akpm@linux-foundation.org: revert arch bits] Signed-off-by: Joe Perches <joe@perches.com> Cc: "Kirill A. Shutemov" <kirill@shutemov.name> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing the changes to include/linux (22 of 61 files). Show all
Unified · Split
| @@ -584,14 +584,13 @@ extern int audit_signals; · 583 unmodified lines | ||
| 584 | 584 | #ifdef CONFIG_AUDIT |
| 585 | 585 | /* These are defined in audit.c */ |
| 586 | 586 | /* Public API */ |
| 587 | −extern void audit_log(struct audit_context *ctx, gfp_t gfp_mask, | |
| 588 | − int type, const char *fmt, ...) | |
| 589 | − __attribute__((format(printf,4,5))); | |
| 587 | +extern __printf(4, 5) | |
| 588 | +void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type, | |
| 589 | + const char *fmt, ...); | |
| 590 | 590 | |
| 591 | 591 | extern struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, int type); |
| 592 | −extern void audit_log_format(struct audit_buffer *ab, | |
| 593 | − const char *fmt, ...) | |
| 594 | − __attribute__((format(printf,2,3))); | |
| 592 | +extern __printf(2, 3) | |
| 593 | +void audit_log_format(struct audit_buffer *ab, const char *fmt, ...); | |
| 595 | 594 | extern void audit_log_end(struct audit_buffer *ab); |
| 596 | 595 | extern int audit_string_contains_control(const char *string, |
| 597 | 596 | size_t len); |
| @@ -170,7 +170,7 @@ extern void blk_trace_shutdown(struct request_queue *); · 169 unmodified lines | ||
| 170 | 170 | extern int do_blk_trace_setup(struct request_queue *q, char *name, |
| 171 | 171 | dev_t dev, struct block_device *bdev, |
| 172 | 172 | struct blk_user_trace_setup *buts); |
| 173 | −extern __attribute__((format(printf, 2, 3))) | |
| 173 | +extern __printf(2, 3) | |
| 174 | 174 | void __trace_note_message(struct blk_trace *, const char *fmt, ...); |
| 175 | 175 | |
| 176 | 176 | /** |
| @@ -622,8 +622,8 @@ static inline const char *dev_name(const struct device *dev) · 621 unmodified lines | ||
| 622 | 622 | return kobject_name(&dev->kobj); |
| 623 | 623 | } |
| 624 | 624 | |
| 625 | −extern int dev_set_name(struct device *dev, const char *name, ...) | |
| 626 | − __attribute__((format(printf, 2, 3))); | |
| 625 | +extern __printf(2, 3) | |
| 626 | +int dev_set_name(struct device *dev, const char *name, ...); | |
| 627 | 627 | |
| 628 | 628 | #ifdef CONFIG_NUMA |
| 629 | 629 | static inline int dev_to_node(struct device *dev) |
| @@ -753,10 +753,10 @@ extern struct device *device_create_vargs(struct class *cls, · 123 unmodified lines | ||
| 753 | 753 | void *drvdata, |
| 754 | 754 | const char *fmt, |
| 755 | 755 | va_list vargs); |
| 756 | −extern struct device *device_create(struct class *cls, struct device *parent, | |
| 757 | − dev_t devt, void *drvdata, | |
| 758 | − const char *fmt, ...) | |
| 759 | − __attribute__((format(printf, 5, 6))); | |
| 756 | +extern __printf(5, 6) | |
| 757 | +struct device *device_create(struct class *cls, struct device *parent, | |
| 758 | + dev_t devt, void *drvdata, | |
| 759 | + const char *fmt, ...); | |
| 760 | 760 | extern void device_destroy(struct class *cls, dev_t devt); |
| 761 | 761 | |
| 762 | 762 | /* |
| @@ -800,64 +800,56 @@ extern const char *dev_driver_string(const struct device *dev); · 37 unmodified lines | ||
| 800 | 800 | |
| 801 | 801 | extern int __dev_printk(const char *level, const struct device *dev, |
| 802 | 802 | struct va_format *vaf); |
| 803 | −extern int dev_printk(const char *level, const struct device *dev, | |
| 804 | − const char *fmt, ...) | |
| 805 | − __attribute__ ((format (printf, 3, 4))); | |
| 806 | −extern int dev_emerg(const struct device *dev, const char *fmt, ...) | |
| 807 | − __attribute__ ((format (printf, 2, 3))); | |
| 808 | −extern int dev_alert(const struct device *dev, const char *fmt, ...) | |
| 809 | − __attribute__ ((format (printf, 2, 3))); | |
| 810 | −extern int dev_crit(const struct device *dev, const char *fmt, ...) | |
| 811 | − __attribute__ ((format (printf, 2, 3))); | |
| 812 | −extern int dev_err(const struct device *dev, const char *fmt, ...) | |
| 813 | − __attribute__ ((format (printf, 2, 3))); | |
| 814 | −extern int dev_warn(const struct device *dev, const char *fmt, ...) | |
| 815 | − __attribute__ ((format (printf, 2, 3))); | |
| 816 | −extern int dev_notice(const struct device *dev, const char *fmt, ...) | |
| 817 | − __attribute__ ((format (printf, 2, 3))); | |
| 818 | −extern int _dev_info(const struct device *dev, const char *fmt, ...) | |
| 819 | − __attribute__ ((format (printf, 2, 3))); | |
| 803 | +extern __printf(3, 4) | |
| 804 | +int dev_printk(const char *level, const struct device *dev, | |
| 805 | + const char *fmt, ...) | |
| 806 | + ; | |
| 807 | +extern __printf(2, 3) | |
| 808 | +int dev_emerg(const struct device *dev, const char *fmt, ...); | |
| 809 | +extern __printf(2, 3) | |
| 810 | +int dev_alert(const struct device *dev, const char *fmt, ...); | |
| 811 | +extern __printf(2, 3) | |
| 812 | +int dev_crit(const struct device *dev, const char *fmt, ...); | |
| 813 | +extern __printf(2, 3) | |
| 814 | +int dev_err(const struct device *dev, const char *fmt, ...); | |
| 815 | +extern __printf(2, 3) | |
| 816 | +int dev_warn(const struct device *dev, const char *fmt, ...); | |
| 817 | +extern __printf(2, 3) | |
| 818 | +int dev_notice(const struct device *dev, const char *fmt, ...); | |
| 819 | +extern __printf(2, 3) | |
| 820 | +int _dev_info(const struct device *dev, const char *fmt, ...); | |
| 820 | 821 | |
| 821 | 822 | #else |
| 822 | 823 | |
| 823 | 824 | static inline int __dev_printk(const char *level, const struct device *dev, |
| 824 | 825 | struct va_format *vaf) |
| 825 | − { return 0; } | |
| 826 | −static inline int dev_printk(const char *level, const struct device *dev, | |
| 827 | − const char *fmt, ...) | |
| 828 | − __attribute__ ((format (printf, 3, 4))); | |
| 829 | −static inline int dev_printk(const char *level, const struct device *dev, | |
| 830 | − const char *fmt, ...) | |
| 831 | − { return 0; } | |
| 832 | − | |
| 833 | −static inline int dev_emerg(const struct device *dev, const char *fmt, ...) | |
| 834 | − __attribute__ ((format (printf, 2, 3))); | |
| 835 | −static inline int dev_emerg(const struct device *dev, const char *fmt, ...) | |
| 836 | − { return 0; } | |
| 837 | −static inline int dev_crit(const struct device *dev, const char *fmt, ...) | |
| 838 | − __attribute__ ((format (printf, 2, 3))); | |
| 839 | −static inline int dev_crit(const struct device *dev, const char *fmt, ...) | |
| 840 | − { return 0; } | |
| 841 | −static inline int dev_alert(const struct device *dev, const char *fmt, ...) | |
| 842 | − __attribute__ ((format (printf, 2, 3))); | |
| 843 | −static inline int dev_alert(const struct device *dev, const char *fmt, ...) | |
| 844 | − { return 0; } | |
| 845 | −static inline int dev_err(const struct device *dev, const char *fmt, ...) | |
| 846 | − __attribute__ ((format (printf, 2, 3))); | |
| 847 | −static inline int dev_err(const struct device *dev, const char *fmt, ...) | |
| 848 | − { return 0; } | |
| 849 | −static inline int dev_warn(const struct device *dev, const char *fmt, ...) | |
| 850 | − __attribute__ ((format (printf, 2, 3))); | |
| 851 | −static inline int dev_warn(const struct device *dev, const char *fmt, ...) | |
| 852 | − { return 0; } | |
| 853 | −static inline int dev_notice(const struct device *dev, const char *fmt, ...) | |
| 854 | − __attribute__ ((format (printf, 2, 3))); | |
| 855 | −static inline int dev_notice(const struct device *dev, const char *fmt, ...) | |
| 856 | − { return 0; } | |
| 857 | −static inline int _dev_info(const struct device *dev, const char *fmt, ...) | |
| 858 | − __attribute__ ((format (printf, 2, 3))); | |
| 859 | −static inline int _dev_info(const struct device *dev, const char *fmt, ...) | |
| 860 | − { return 0; } | |
| 826 | +{ return 0; } | |
| 827 | +static inline __printf(3, 4) | |
| 828 | +int dev_printk(const char *level, const struct device *dev, | |
| 829 | + const char *fmt, ...) | |
| 830 | +{ return 0; } | |
| 831 | + | |
| 832 | +static inline __printf(2, 3) | |
| 833 | +int dev_emerg(const struct device *dev, const char *fmt, ...) | |
| 834 | +{ return 0; } | |
| 835 | +static inline __printf(2, 3) | |
| 836 | +int dev_crit(const struct device *dev, const char *fmt, ...) | |
| 837 | +{ return 0; } | |
| 838 | +static inline __printf(2, 3) | |
| 839 | +int dev_alert(const struct device *dev, const char *fmt, ...) | |
| 840 | +{ return 0; } | |
| 841 | +static inline __printf(2, 3) | |
| 842 | +int dev_err(const struct device *dev, const char *fmt, ...) | |
| 843 | +{ return 0; } | |
| 844 | +static inline __printf(2, 3) | |
| 845 | +int dev_warn(const struct device *dev, const char *fmt, ...) | |
| 846 | +{ return 0; } | |
| 847 | +static inline __printf(2, 3) | |
| 848 | +int dev_notice(const struct device *dev, const char *fmt, ...) | |
| 849 | +{ return 0; } | |
| 850 | +static inline __printf(2, 3) | |
| 851 | +int _dev_info(const struct device *dev, const char *fmt, ...) | |
| 852 | +{ return 0; } | |
| 861 | 853 | |
| 862 | 854 | #endif |
| 863 | 855 | |
| @@ -37,22 +37,21 @@ int ddebug_add_module(struct _ddebug *tab, unsigned int n, · 36 unmodified lines | ||
| 37 | 37 | |
| 38 | 38 | #if defined(CONFIG_DYNAMIC_DEBUG) |
| 39 | 39 | extern int ddebug_remove_module(const char *mod_name); |
| 40 | −extern int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...) | |
| 41 | − __attribute__ ((format (printf, 2, 3))); | |
| 40 | +extern __printf(2, 3) | |
| 41 | +int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...); | |
| 42 | 42 | |
| 43 | 43 | struct device; |
| 44 | 44 | |
| 45 | −extern int __dynamic_dev_dbg(struct _ddebug *descriptor, | |
| 46 | − const struct device *dev, | |
| 47 | − const char *fmt, ...) | |
| 48 | − __attribute__ ((format (printf, 3, 4))); | |
| 45 | +extern __printf(3, 4) | |
| 46 | +int __dynamic_dev_dbg(struct _ddebug *descriptor, const struct device *dev, | |
| 47 | + const char *fmt, ...); | |
| 49 | 48 | |
| 50 | 49 | struct net_device; |
| 51 | 50 | |
| 52 | −extern int __dynamic_netdev_dbg(struct _ddebug *descriptor, | |
| 53 | − const struct net_device *dev, | |
| 54 | − const char *fmt, ...) | |
| 55 | − __attribute__ ((format (printf, 3, 4))); | |
| 51 | +extern __printf(3, 4) | |
| 52 | +int __dynamic_netdev_dbg(struct _ddebug *descriptor, | |
| 53 | + const struct net_device *dev, | |
| 54 | + const char *fmt, ...); | |
| 56 | 55 | |
| 57 | 56 | #define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt) \ |
| 58 | 57 | static struct _ddebug __used __aligned(8) \ |
| @@ -937,15 +937,15 @@ extern int ext3_group_extend(struct super_block *sb, · 936 unmodified lines | ||
| 937 | 937 | ext3_fsblk_t n_blocks_count); |
| 938 | 938 | |
| 939 | 939 | /* super.c */ |
| 940 | −extern void ext3_error (struct super_block *, const char *, const char *, ...) | |
| 941 | − __attribute__ ((format (printf, 3, 4))); | |
| 940 | +extern __printf(3, 4) | |
| 941 | +void ext3_error(struct super_block *, const char *, const char *, ...); | |
| 942 | 942 | extern void __ext3_std_error (struct super_block *, const char *, int); |
| 943 | −extern void ext3_abort (struct super_block *, const char *, const char *, ...) | |
| 944 | − __attribute__ ((format (printf, 3, 4))); | |
| 945 | −extern void ext3_warning (struct super_block *, const char *, const char *, ...) | |
| 946 | − __attribute__ ((format (printf, 3, 4))); | |
| 947 | −extern void ext3_msg(struct super_block *, const char *, const char *, ...) | |
| 948 | − __attribute__ ((format (printf, 3, 4))); | |
| 943 | +extern __printf(3, 4) | |
| 944 | +void ext3_abort(struct super_block *, const char *, const char *, ...); | |
| 945 | +extern __printf(3, 4) | |
| 946 | +void ext3_warning(struct super_block *, const char *, const char *, ...); | |
| 947 | +extern __printf(3, 4) | |
| 948 | +void ext3_msg(struct super_block *, const char *, const char *, ...); | |
| 949 | 949 | extern void ext3_update_dynamic_rev (struct super_block *sb); |
| 950 | 950 | |
| 951 | 951 | #define ext3_std_error(sb, errno) \ |
| @@ -2635,8 +2635,8 @@ static const struct file_operations __fops = { \ · 2634 unmodified lines | ||
| 2635 | 2635 | .llseek = generic_file_llseek, \ |
| 2636 | 2636 | }; |
| 2637 | 2637 | |
| 2638 | −static inline void __attribute__((format(printf, 1, 2))) | |
| 2639 | −__simple_attr_check_format(const char *fmt, ...) | |
| 2638 | +static inline __printf(1, 2) | |
| 2639 | +void __simple_attr_check_format(const char *fmt, ...) | |
| 2640 | 2640 | { |
| 2641 | 2641 | /* don't do anything, just let the compiler check the arguments; */ |
| 2642 | 2642 | } |
| @@ -492,10 +492,10 @@ static inline void fscache_end_io(struct fscache_retrieval *op, · 491 unmodified lines | ||
| 492 | 492 | /* |
| 493 | 493 | * out-of-line cache backend functions |
| 494 | 494 | */ |
| 495 | −extern void fscache_init_cache(struct fscache_cache *cache, | |
| 496 | − const struct fscache_cache_ops *ops, | |
| 497 | − const char *idfmt, | |
| 498 | − ...) __attribute__ ((format (printf, 3, 4))); | |
| 495 | +extern __printf(3, 4) | |
| 496 | +void fscache_init_cache(struct fscache_cache *cache, | |
| 497 | + const struct fscache_cache_ops *ops, | |
| 498 | + const char *idfmt, ...); | |
| 499 | 499 | |
| 500 | 500 | extern int fscache_add_cache(struct fscache_cache *cache, |
| 501 | 501 | struct fscache_object *fsdef, |
| @@ -78,8 +78,8 @@ static inline void gameport_register_port(struct gameport *gameport) · 77 unmodified lines | ||
| 78 | 78 | |
| 79 | 79 | void gameport_unregister_port(struct gameport *gameport); |
| 80 | 80 | |
| 81 | −void gameport_set_phys(struct gameport *gameport, const char *fmt, ...) | |
| 82 | − __attribute__ ((format (printf, 2, 3))); | |
| 81 | +__printf(2, 3) | |
| 82 | +void gameport_set_phys(struct gameport *gameport, const char *fmt, ...); | |
| 83 | 83 | |
| 84 | 84 | #else |
| 85 | 85 | |
| @@ -93,8 +93,8 @@ static inline void gameport_unregister_port(struct gameport *gameport) · 7 unmodified lines | ||
| 93 | 93 | return; |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | −static inline void gameport_set_phys(struct gameport *gameport, | |
| 97 | − const char *fmt, ...) | |
| 96 | +static inline __printf(2, 3) | |
| 97 | +void gameport_set_phys(struct gameport *gameport, const char *fmt, ...) | |
| 98 | 98 | { |
| 99 | 99 | return; |
| 100 | 100 | } |
| @@ -101,9 +101,8 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u · 100 unmodified lines | ||
| 101 | 101 | #endif /*CONFIG_KALLSYMS*/ |
| 102 | 102 | |
| 103 | 103 | /* This macro allows us to keep printk typechecking */ |
| 104 | −static void __check_printsym_format(const char *fmt, ...) | |
| 105 | −__attribute__((format(printf,1,2))); | |
| 106 | −static inline void __check_printsym_format(const char *fmt, ...) | |
| 104 | +static __printf(1, 2) | |
| 105 | +void __check_printsym_format(const char *fmt, ...) | |
| 107 | 106 | { |
| 108 | 107 | } |
| 109 | 108 | |
| @@ -114,12 +114,9 @@ typedef enum { · 113 unmodified lines | ||
| 114 | 114 | } kdb_reason_t; |
| 115 | 115 | |
| 116 | 116 | extern int kdb_trap_printk; |
| 117 | −extern int vkdb_printf(const char *fmt, va_list args) | |
| 118 | − __attribute__ ((format (printf, 1, 0))); | |
| 119 | −extern int kdb_printf(const char *, ...) | |
| 120 | − __attribute__ ((format (printf, 1, 2))); | |
| 121 | −typedef int (*kdb_printf_t)(const char *, ...) | |
| 122 | − __attribute__ ((format (printf, 1, 2))); | |
| 117 | +extern __printf(1, 0) int vkdb_printf(const char *fmt, va_list args); | |
| 118 | +extern __printf(1, 2) int kdb_printf(const char *, ...); | |
| 119 | +typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...); | |
| 123 | 120 | |
| 124 | 121 | extern void kdb_init(int level); |
| 125 | 122 | |
| @@ -296,20 +296,18 @@ extern long long simple_strtoll(const char *,char **,unsigned int); · 295 unmodified lines | ||
| 296 | 296 | #define strict_strtoull kstrtoull |
| 297 | 297 | #define strict_strtoll kstrtoll |
| 298 | 298 | |
| 299 | −extern int sprintf(char * buf, const char * fmt, ...) | |
| 300 | − __attribute__ ((format (printf, 2, 3))); | |
| 301 | −extern int vsprintf(char *buf, const char *, va_list) | |
| 302 | − __attribute__ ((format (printf, 2, 0))); | |
| 303 | −extern int snprintf(char * buf, size_t size, const char * fmt, ...) | |
| 304 | − __attribute__ ((format (printf, 3, 4))); | |
| 305 | −extern int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) | |
| 306 | − __attribute__ ((format (printf, 3, 0))); | |
| 307 | −extern int scnprintf(char * buf, size_t size, const char * fmt, ...) | |
| 308 | − __attribute__ ((format (printf, 3, 4))); | |
| 309 | −extern int vscnprintf(char *buf, size_t size, const char *fmt, va_list args) | |
| 310 | − __attribute__ ((format (printf, 3, 0))); | |
| 311 | −extern char *kasprintf(gfp_t gfp, const char *fmt, ...) | |
| 312 | − __attribute__ ((format (printf, 2, 3))); | |
| 299 | +extern __printf(2, 3) int sprintf(char *buf, const char * fmt, ...); | |
| 300 | +extern __printf(2, 0) int vsprintf(char *buf, const char *, va_list); | |
| 301 | +extern __printf(3, 4) | |
| 302 | +int snprintf(char *buf, size_t size, const char *fmt, ...); | |
| 303 | +extern __printf(3, 0) | |
| 304 | +int vsnprintf(char *buf, size_t size, const char *fmt, va_list args); | |
| 305 | +extern __printf(3, 4) | |
| 306 | +int scnprintf(char *buf, size_t size, const char *fmt, ...); | |
| 307 | +extern __printf(3, 0) | |
| 308 | +int vscnprintf(char *buf, size_t size, const char *fmt, va_list args); | |
| 309 | +extern __printf(2, 3) | |
| 310 | +char *kasprintf(gfp_t gfp, const char *fmt, ...); | |
| 313 | 311 | extern char *kvasprintf(gfp_t gfp, const char *fmt, va_list args); |
| 314 | 312 | |
| 315 | 313 | extern int sscanf(const char *, const char *, ...) |
| @@ -427,8 +425,8 @@ extern void tracing_start(void); · 111 unmodified lines | ||
| 427 | 425 | extern void tracing_stop(void); |
| 428 | 426 | extern void ftrace_off_permanent(void); |
| 429 | 427 | |
| 430 | −static inline void __attribute__ ((format (printf, 1, 2))) | |
| 431 | −____trace_printk_check_format(const char *fmt, ...) | |
| 428 | +static inline __printf(1, 2) | |
| 429 | +void ____trace_printk_check_format(const char *fmt, ...) | |
| 432 | 430 | { |
| 433 | 431 | } |
| 434 | 432 | #define __trace_printk_check_format(fmt, args...) \ |
| @@ -467,13 +465,11 @@ do { \ · 32 unmodified lines | ||
| 467 | 465 | __trace_printk(_THIS_IP_, fmt, ##args); \ |
| 468 | 466 | } while (0) |
| 469 | 467 | |
| 470 | −extern int | |
| 471 | −__trace_bprintk(unsigned long ip, const char *fmt, ...) | |
| 472 | − __attribute__ ((format (printf, 2, 3))); | |
| 468 | +extern __printf(2, 3) | |
| 469 | +int __trace_bprintk(unsigned long ip, const char *fmt, ...); | |
| 473 | 470 | |
| 474 | −extern int | |
| 475 | −__trace_printk(unsigned long ip, const char *fmt, ...) | |
| 476 | − __attribute__ ((format (printf, 2, 3))); | |
| 471 | +extern __printf(2, 3) | |
| 472 | +int __trace_printk(unsigned long ip, const char *fmt, ...); | |
| 477 | 473 | |
| 478 | 474 | extern void trace_dump_stack(void); |
| 479 | 475 | |
| @@ -502,8 +498,8 @@ __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap); · 22 unmodified lines | ||
| 502 | 498 | |
| 503 | 499 | extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode); |
| 504 | 500 | #else |
| 505 | −static inline int | |
| 506 | −trace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); | |
| 501 | +static inline __printf(1, 2) | |
| 502 | +int trace_printk(const char *fmt, ...); | |
| 507 | 503 | |
| 508 | 504 | static inline void tracing_start(void) { } |
| 509 | 505 | static inline void tracing_stop(void) { } |
| @@ -130,8 +130,8 @@ int kexec_should_crash(struct task_struct *); · 129 unmodified lines | ||
| 130 | 130 | void crash_save_cpu(struct pt_regs *regs, int cpu); |
| 131 | 131 | void crash_save_vmcoreinfo(void); |
| 132 | 132 | void arch_crash_save_vmcoreinfo(void); |
| 133 | −void vmcoreinfo_append_str(const char *fmt, ...) | |
| 134 | − __attribute__ ((format (printf, 1, 2))); | |
| 133 | +__printf(1, 2) | |
| 134 | +void vmcoreinfo_append_str(const char *fmt, ...); | |
| 135 | 135 | unsigned long paddr_vmcoreinfo_note(void); |
| 136 | 136 | |
| 137 | 137 | #define VMCOREINFO_OSRELEASE(value) \ |
| @@ -32,8 +32,8 @@ · 31 unmodified lines | ||
| 32 | 32 | extern char modprobe_path[]; /* for sysctl */ |
| 33 | 33 | /* modprobe exit status on success, -ve on error. Return value |
| 34 | 34 | * usually useless though. */ |
| 35 | −extern int __request_module(bool wait, const char *name, ...) \ | |
| 36 | − __attribute__((format(printf, 2, 3))); | |
| 35 | +extern __printf(2, 3) | |
| 36 | +int __request_module(bool wait, const char *name, ...); | |
| 37 | 37 | #define request_module(mod...) __request_module(true, mod) |
| 38 | 38 | #define request_module_nowait(mod...) __request_module(false, mod) |
| 39 | 39 | #define try_then_request_module(x, mod...) \ |
| @@ -72,8 +72,8 @@ struct kobject { · 71 unmodified lines | ||
| 72 | 72 | unsigned int uevent_suppress:1; |
| 73 | 73 | }; |
| 74 | 74 | |
| 75 | −extern int kobject_set_name(struct kobject *kobj, const char *name, ...) | |
| 76 | − __attribute__((format(printf, 2, 3))); | |
| 75 | +extern __printf(2, 3) | |
| 76 | +int kobject_set_name(struct kobject *kobj, const char *name, ...); | |
| 77 | 77 | extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, |
| 78 | 78 | va_list vargs); |
| 79 | 79 | |
| @@ -83,15 +83,13 @@ static inline const char *kobject_name(const struct kobject *kobj) · 3 unmodified lines | ||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | extern void kobject_init(struct kobject *kobj, struct kobj_type *ktype); |
| 86 | −extern int __must_check kobject_add(struct kobject *kobj, | |
| 87 | − struct kobject *parent, | |
| 88 | − const char *fmt, ...) | |
| 89 | − __attribute__((format(printf, 3, 4))); | |
| 90 | −extern int __must_check kobject_init_and_add(struct kobject *kobj, | |
| 91 | − struct kobj_type *ktype, | |
| 92 | − struct kobject *parent, | |
| 93 | − const char *fmt, ...) | |
| 94 | − __attribute__((format(printf, 4, 5))); | |
| 86 | +extern __printf(3, 4) __must_check | |
| 87 | +int kobject_add(struct kobject *kobj, struct kobject *parent, | |
| 88 | + const char *fmt, ...); | |
| 89 | +extern __printf(4, 5) __must_check | |
| 90 | +int kobject_init_and_add(struct kobject *kobj, | |
| 91 | + struct kobj_type *ktype, struct kobject *parent, | |
| 92 | + const char *fmt, ...); | |
| 95 | 93 | |
| 96 | 94 | extern void kobject_del(struct kobject *kobj); |
| 97 | 95 | |
| @@ -212,8 +210,8 @@ int kobject_uevent(struct kobject *kobj, enum kobject_action action); · 114 unmodified lines | ||
| 212 | 210 | int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, |
| 213 | 211 | char *envp[]); |
| 214 | 212 | |
| 215 | −int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) | |
| 216 | − __attribute__((format (printf, 2, 3))); | |
| 213 | +__printf(2, 3) | |
| 214 | +int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...); | |
| 217 | 215 | |
| 218 | 216 | int kobject_action_type(const char *buf, size_t count, |
| 219 | 217 | enum kobject_action *type); |
| @@ -226,7 +224,7 @@ static inline int kobject_uevent_env(struct kobject *kobj, · 6 unmodified lines | ||
| 226 | 224 | char *envp[]) |
| 227 | 225 | { return 0; } |
| 228 | 226 | |
| 229 | −static inline __attribute__((format(printf, 2, 3))) | |
| 227 | +static inline __printf(2, 3) | |
| 230 | 228 | int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) |
| 231 | 229 | { return 0; } |
| 232 | 230 | |
| @@ -4,11 +4,11 @@ · 3 unmodified lines | ||
| 4 | 4 | #include <linux/err.h> |
| 5 | 5 | #include <linux/sched.h> |
| 6 | 6 | |
| 7 | +__printf(4, 5) | |
| 7 | 8 | struct task_struct *kthread_create_on_node(int (*threadfn)(void *data), |
| 8 | 9 | void *data, |
| 9 | 10 | int node, |
| 10 | − const char namefmt[], ...) | |
| 11 | − __attribute__((format(printf, 4, 5))); | |
| 11 | + const char namefmt[], ...); | |
| 12 | 12 | |
| 13 | 13 | #define kthread_create(threadfn, data, namefmt, arg...) \ |
| 14 | 14 | kthread_create_on_node(threadfn, data, -1, namefmt, ##arg) |
| @@ -1256,13 +1256,13 @@ static inline int sata_srst_pmp(struct ata_link *link) · 1255 unmodified lines | ||
| 1256 | 1256 | /* |
| 1257 | 1257 | * printk helpers |
| 1258 | 1258 | */ |
| 1259 | −__attribute__((format (printf, 3, 4))) | |
| 1259 | +__printf(3, 4) | |
| 1260 | 1260 | int ata_port_printk(const struct ata_port *ap, const char *level, |
| 1261 | 1261 | const char *fmt, ...); |
| 1262 | −__attribute__((format (printf, 3, 4))) | |
| 1262 | +__printf(3, 4) | |
| 1263 | 1263 | int ata_link_printk(const struct ata_link *link, const char *level, |
| 1264 | 1264 | const char *fmt, ...); |
| 1265 | −__attribute__((format (printf, 3, 4))) | |
| 1265 | +__printf(3, 4) | |
| 1266 | 1266 | int ata_dev_printk(const struct ata_device *dev, const char *level, |
| 1267 | 1267 | const char *fmt, ...); |
| 1268 | 1268 | |
| @@ -1304,10 +1304,10 @@ void ata_print_version(const struct device *dev, const char *version); · 35 unmodified lines | ||
| 1304 | 1304 | /* |
| 1305 | 1305 | * ata_eh_info helpers |
| 1306 | 1306 | */ |
| 1307 | −extern void __ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...) | |
| 1308 | − __attribute__ ((format (printf, 2, 3))); | |
| 1309 | −extern void ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...) | |
| 1310 | − __attribute__ ((format (printf, 2, 3))); | |
| 1307 | +extern __printf(2, 3) | |
| 1308 | +void __ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...); | |
| 1309 | +extern __printf(2, 3) | |
| 1310 | +void ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...); | |
| 1311 | 1311 | extern void ata_ehi_clear_desc(struct ata_eh_info *ehi); |
| 1312 | 1312 | |
| 1313 | 1313 | static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi) |
| @@ -1321,8 +1321,8 @@ static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi) · 7 unmodified lines | ||
| 1321 | 1321 | /* |
| 1322 | 1322 | * port description helpers |
| 1323 | 1323 | */ |
| 1324 | −extern void ata_port_desc(struct ata_port *ap, const char *fmt, ...) | |
| 1325 | − __attribute__ ((format (printf, 2, 3))); | |
| 1324 | +extern __printf(2, 3) | |
| 1325 | +void ata_port_desc(struct ata_port *ap, const char *fmt, ...); | |
| 1326 | 1326 | #ifdef CONFIG_PCI |
| 1327 | 1327 | extern void ata_port_pbar_desc(struct ata_port *ap, int bar, ssize_t offset, |
| 1328 | 1328 | const char *name); |
| @@ -49,8 +49,7 @@ extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size, · 48 unmodified lines | ||
| 49 | 49 | extern void mmiotrace_iounmap(volatile void __iomem *addr); |
| 50 | 50 | |
| 51 | 51 | /* For anyone to insert markers. Remember trailing newline. */ |
| 52 | −extern int mmiotrace_printk(const char *fmt, ...) | |
| 53 | − __attribute__ ((format (printf, 1, 2))); | |
| 52 | +extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...); | |
| 54 | 53 | #else /* !CONFIG_MMIOTRACE: */ |
| 55 | 54 | static inline int is_kmmio_active(void) |
| 56 | 55 | { |
| @@ -71,10 +70,7 @@ static inline void mmiotrace_iounmap(volatile void __iomem *addr) · 14 unmodified lines | ||
| 71 | 70 | { |
| 72 | 71 | } |
| 73 | 72 | |
| 74 | −static inline int mmiotrace_printk(const char *fmt, ...) | |
| 75 | − __attribute__ ((format (printf, 1, 0))); | |
| 76 | − | |
| 77 | −static inline int mmiotrace_printk(const char *fmt, ...) | |
| 73 | +static inline __printf(1, 2) int mmiotrace_printk(const char *fmt, ...) | |
| 78 | 74 | { |
| 79 | 75 | return 0; |
| 80 | 76 | } |
| @@ -2622,23 +2622,23 @@ static inline const char *netdev_name(const struct net_device *dev) · 2621 unmodified lines | ||
| 2622 | 2622 | extern int __netdev_printk(const char *level, const struct net_device *dev, |
| 2623 | 2623 | struct va_format *vaf); |
| 2624 | 2624 | |
| 2625 | −extern int netdev_printk(const char *level, const struct net_device *dev, | |
| 2626 | − const char *format, ...) | |
| 2627 | − __attribute__ ((format (printf, 3, 4))); | |
| 2628 | −extern int netdev_emerg(const struct net_device *dev, const char *format, ...) | |
| 2629 | − __attribute__ ((format (printf, 2, 3))); | |
| 2630 | −extern int netdev_alert(const struct net_device *dev, const char *format, ...) | |
| 2631 | − __attribute__ ((format (printf, 2, 3))); | |
| 2632 | −extern int netdev_crit(const struct net_device *dev, const char *format, ...) | |
| 2633 | − __attribute__ ((format (printf, 2, 3))); | |
| 2634 | −extern int netdev_err(const struct net_device *dev, const char *format, ...) | |
| 2635 | − __attribute__ ((format (printf, 2, 3))); | |
| 2636 | −extern int netdev_warn(const struct net_device *dev, const char *format, ...) | |
| 2637 | − __attribute__ ((format (printf, 2, 3))); | |
| 2638 | −extern int netdev_notice(const struct net_device *dev, const char *format, ...) | |
| 2639 | − __attribute__ ((format (printf, 2, 3))); | |
| 2640 | −extern int netdev_info(const struct net_device *dev, const char *format, ...) | |
| 2641 | − __attribute__ ((format (printf, 2, 3))); | |
| 2625 | +extern __printf(3, 4) | |
| 2626 | +int netdev_printk(const char *level, const struct net_device *dev, | |
| 2627 | + const char *format, ...); | |
| 2628 | +extern __printf(2, 3) | |
| 2629 | +int netdev_emerg(const struct net_device *dev, const char *format, ...); | |
| 2630 | +extern __printf(2, 3) | |
| 2631 | +int netdev_alert(const struct net_device *dev, const char *format, ...); | |
| 2632 | +extern __printf(2, 3) | |
| 2633 | +int netdev_crit(const struct net_device *dev, const char *format, ...); | |
| 2634 | +extern __printf(2, 3) | |
| 2635 | +int netdev_err(const struct net_device *dev, const char *format, ...); | |
| 2636 | +extern __printf(2, 3) | |
| 2637 | +int netdev_warn(const struct net_device *dev, const char *format, ...); | |
| 2638 | +extern __printf(2, 3) | |
| 2639 | +int netdev_notice(const struct net_device *dev, const char *format, ...); | |
| 2640 | +extern __printf(2, 3) | |
| 2641 | +int netdev_info(const struct net_device *dev, const char *format, ...); | |
| 2642 | 2642 | |
| 2643 | 2643 | #define MODULE_ALIAS_NETDEV(device) \ |
| 2644 | 2644 | MODULE_ALIAS("netdev-" device) |
| @@ -82,22 +82,22 @@ struct va_format { · 81 unmodified lines | ||
| 82 | 82 | * Dummy printk for disabled debugging statements to use whilst maintaining |
| 83 | 83 | * gcc's format and side-effect checking. |
| 84 | 84 | */ |
| 85 | −static inline __attribute__ ((format (printf, 1, 2))) | |
| 85 | +static inline __printf(1, 2) | |
| 86 | 86 | int no_printk(const char *fmt, ...) |
| 87 | 87 | { |
| 88 | 88 | return 0; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | −extern asmlinkage __attribute__ ((format (printf, 1, 2))) | |
| 91 | +extern asmlinkage __printf(1, 2) | |
| 92 | 92 | void early_printk(const char *fmt, ...); |
| 93 | 93 | |
| 94 | 94 | extern int printk_needs_cpu(int cpu); |
| 95 | 95 | extern void printk_tick(void); |
| 96 | 96 | |
| 97 | 97 | #ifdef CONFIG_PRINTK |
| 98 | −asmlinkage __attribute__ ((format (printf, 1, 0))) | |
| 98 | +asmlinkage __printf(1, 0) | |
| 99 | 99 | int vprintk(const char *fmt, va_list args); |
| 100 | −asmlinkage __attribute__ ((format (printf, 1, 2))) __cold | |
| 100 | +asmlinkage __printf(1, 2) __cold | |
| 101 | 101 | int printk(const char *fmt, ...); |
| 102 | 102 | |
| 103 | 103 | /* |
| @@ -117,12 +117,12 @@ extern int kptr_restrict; · 13 unmodified lines | ||
| 117 | 117 | void log_buf_kexec_setup(void); |
| 118 | 118 | void __init setup_log_buf(int early); |
| 119 | 119 | #else |
| 120 | −static inline __attribute__ ((format (printf, 1, 0))) | |
| 120 | +static inline __printf(1, 0) | |
| 121 | 121 | int vprintk(const char *s, va_list args) |
| 122 | 122 | { |
| 123 | 123 | return 0; |
| 124 | 124 | } |
| 125 | −static inline __attribute__ ((format (printf, 1, 2))) __cold | |
| 125 | +static inline __printf(1, 2) __cold | |
| 126 | 126 | int printk(const char *s, ...) |
| 127 | 127 | { |
| 128 | 128 | return 0; |
| @@ -31,7 +31,7 @@ static inline bool is_quota_modification(struct inode *inode, struct iattr *ia) · 30 unmodified lines | ||
| 31 | 31 | #define quota_error(sb, fmt, args...) \ |
| 32 | 32 | __quota_error((sb), __func__, fmt , ## args) |
| 33 | 33 | |
| 34 | −extern __attribute__((format (printf, 3, 4))) | |
| 34 | +extern __printf(3, 4) | |
| 35 | 35 | void __quota_error(struct super_block *sb, const char *func, |
| 36 | 36 | const char *fmt, ...); |
| 37 | 37 | |
| @@ -84,8 +84,7 @@ int seq_putc(struct seq_file *m, char c); · 83 unmodified lines | ||
| 84 | 84 | int seq_puts(struct seq_file *m, const char *s); |
| 85 | 85 | int seq_write(struct seq_file *seq, const void *data, size_t len); |
| 86 | 86 | |
| 87 | −int seq_printf(struct seq_file *, const char *, ...) | |
| 88 | − __attribute__ ((format (printf,2,3))); | |
| 87 | +__printf(2, 3) int seq_printf(struct seq_file *, const char *, ...); | |
| 89 | 88 | |
| 90 | 89 | int seq_path(struct seq_file *, struct path *, char *); |
| 91 | 90 | int seq_dentry(struct seq_file *, struct dentry *, char *); |
| @@ -29,10 +29,10 @@ trace_seq_init(struct trace_seq *s) · 28 unmodified lines | ||
| 29 | 29 | * Currently only defined when tracing is enabled. |
| 30 | 30 | */ |
| 31 | 31 | #ifdef CONFIG_TRACING |
| 32 | −extern int trace_seq_printf(struct trace_seq *s, const char *fmt, ...) | |
| 33 | − __attribute__ ((format (printf, 2, 3))); | |
| 34 | −extern int trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args) | |
| 35 | − __attribute__ ((format (printf, 2, 0))); | |
| 32 | +extern __printf(2, 3) | |
| 33 | +int trace_seq_printf(struct trace_seq *s, const char *fmt, ...); | |
| 34 | +extern __printf(2, 0) | |
| 35 | +int trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args); | |
| 36 | 36 | extern int |
| 37 | 37 | trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary); |
| 38 | 38 | extern int trace_print_seq(struct seq_file *m, struct trace_seq *s); |