History

treewide: use __printf not __attribute__((format(printf,...)))

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>

Joe Perches committed 15 years ago

Commit b9075fa1 parent ae29bc961 files · +324 −350Browse files

Showing the changes to include/linux (22 of 61 files). Show all

Unified · Split

22 files
  1. include/linux/audit.h +5 −6
  2. include/linux/blktrace_api.h +1 −1
  3. include/linux/device.h +51 −59
  4. include/linux/dynamic_debug.h +9 −10
  5. include/linux/ext3_fs.h +8 −8
  6. include/linux/fs.h +2 −2
  7. include/linux/fscache-cache.h +4 −4
  8. include/linux/gameport.h +4 −4
  9. include/linux/kallsyms.h +2 −3
  10. include/linux/kdb.h +3 −6
  11. include/linux/kernel.h +20 −24
  12. include/linux/kexec.h +2 −2
  13. include/linux/kmod.h +2 −2
  14. include/linux/kobject.h +12 −14
  15. include/linux/kthread.h +2 −2
  16. include/linux/libata.h +9 −9
  17. include/linux/mmiotrace.h +2 −6
  18. include/linux/netdevice.h +17 −17
  19. include/linux/printk.h +6 −6
  20. include/linux/quotaops.h +1 −1
  21. include/linux/seq_file.h +1 −2
  22. include/linux/trace_seq.h +4 −4
include/linux/audit.h+5−6
@@ -584,14 +584,13 @@ extern int audit_signals; · 583 unmodified lines
584584 #ifdef CONFIG_AUDIT
585585 /* These are defined in audit.c */
586586 /* 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, ...);
590590
591591 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, ...);
595594 extern void audit_log_end(struct audit_buffer *ab);
596595 extern int audit_string_contains_control(const char *string,
597596 size_t len);
include/linux/blktrace_api.h+1−1
@@ -170,7 +170,7 @@ extern void blk_trace_shutdown(struct request_queue *); · 169 unmodified lines
170170 extern int do_blk_trace_setup(struct request_queue *q, char *name,
171171 dev_t dev, struct block_device *bdev,
172172 struct blk_user_trace_setup *buts);
173−extern __attribute__((format(printf, 2, 3)))
173+extern __printf(2, 3)
174174 void __trace_note_message(struct blk_trace *, const char *fmt, ...);
175175
176176 /**
include/linux/device.h+51−59
@@ -622,8 +622,8 @@ static inline const char *dev_name(const struct device *dev) · 621 unmodified lines
622622 return kobject_name(&dev->kobj);
623623 }
624624
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, ...);
627627
628628 #ifdef CONFIG_NUMA
629629 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
753753 void *drvdata,
754754 const char *fmt,
755755 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, ...);
760760 extern void device_destroy(struct class *cls, dev_t devt);
761761
762762 /*
@@ -800,64 +800,56 @@ extern const char *dev_driver_string(const struct device *dev); · 37 unmodified lines
800800
801801 extern int __dev_printk(const char *level, const struct device *dev,
802802 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, ...);
820821
821822 #else
822823
823824 static inline int __dev_printk(const char *level, const struct device *dev,
824825 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; }
861853
862854 #endif
863855
include/linux/dynamic_debug.h+9−10
@@ -37,22 +37,21 @@ int ddebug_add_module(struct _ddebug *tab, unsigned int n, · 36 unmodified lines
3737
3838 #if defined(CONFIG_DYNAMIC_DEBUG)
3939 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, ...);
4242
4343 struct device;
4444
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, ...);
4948
5049 struct net_device;
5150
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, ...);
5655
5756 #define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt) \
5857 static struct _ddebug __used __aligned(8) \
include/linux/ext3_fs.h+8−8
@@ -937,15 +937,15 @@ extern int ext3_group_extend(struct super_block *sb, · 936 unmodified lines
937937 ext3_fsblk_t n_blocks_count);
938938
939939 /* 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 *, ...);
942942 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 *, ...);
949949 extern void ext3_update_dynamic_rev (struct super_block *sb);
950950
951951 #define ext3_std_error(sb, errno) \
include/linux/fs.h+2−2
@@ -2635,8 +2635,8 @@ static const struct file_operations __fops = { \ · 2634 unmodified lines
26352635 .llseek = generic_file_llseek, \
26362636 };
26372637
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, ...)
26402640 {
26412641 /* don't do anything, just let the compiler check the arguments; */
26422642 }
include/linux/fscache-cache.h+4−4
@@ -492,10 +492,10 @@ static inline void fscache_end_io(struct fscache_retrieval *op, · 491 unmodified lines
492492 /*
493493 * out-of-line cache backend functions
494494 */
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, ...);
499499
500500 extern int fscache_add_cache(struct fscache_cache *cache,
501501 struct fscache_object *fsdef,
include/linux/gameport.h+4−4
@@ -78,8 +78,8 @@ static inline void gameport_register_port(struct gameport *gameport) · 77 unmodified lines
7878
7979 void gameport_unregister_port(struct gameport *gameport);
8080
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, ...);
8383
8484 #else
8585
@@ -93,8 +93,8 @@ static inline void gameport_unregister_port(struct gameport *gameport) · 7 unmodified lines
9393 return;
9494 }
9595
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, ...)
9898 {
9999 return;
100100 }
include/linux/kallsyms.h+2−3
@@ -101,9 +101,8 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u · 100 unmodified lines
101101 #endif /*CONFIG_KALLSYMS*/
102102
103103 /* 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, ...)
107106 {
108107 }
109108
include/linux/kdb.h+3−6
@@ -114,12 +114,9 @@ typedef enum { · 113 unmodified lines
114114 } kdb_reason_t;
115115
116116 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 *, ...);
123120
124121 extern void kdb_init(int level);
125122
include/linux/kernel.h+20−24
@@ -296,20 +296,18 @@ extern long long simple_strtoll(const char *,char **,unsigned int); · 295 unmodified lines
296296 #define strict_strtoull kstrtoull
297297 #define strict_strtoll kstrtoll
298298
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, ...);
313311 extern char *kvasprintf(gfp_t gfp, const char *fmt, va_list args);
314312
315313 extern int sscanf(const char *, const char *, ...)
@@ -427,8 +425,8 @@ extern void tracing_start(void); · 111 unmodified lines
427425 extern void tracing_stop(void);
428426 extern void ftrace_off_permanent(void);
429427
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, ...)
432430 {
433431 }
434432 #define __trace_printk_check_format(fmt, args...) \
@@ -467,13 +465,11 @@ do { \ · 32 unmodified lines
467465 __trace_printk(_THIS_IP_, fmt, ##args); \
468466 } while (0)
469467
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, ...);
473470
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, ...);
477473
478474 extern void trace_dump_stack(void);
479475
@@ -502,8 +498,8 @@ __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap); · 22 unmodified lines
502498
503499 extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode);
504500 #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, ...);
507503
508504 static inline void tracing_start(void) { }
509505 static inline void tracing_stop(void) { }
include/linux/kexec.h+2−2
@@ -130,8 +130,8 @@ int kexec_should_crash(struct task_struct *); · 129 unmodified lines
130130 void crash_save_cpu(struct pt_regs *regs, int cpu);
131131 void crash_save_vmcoreinfo(void);
132132 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, ...);
135135 unsigned long paddr_vmcoreinfo_note(void);
136136
137137 #define VMCOREINFO_OSRELEASE(value) \
include/linux/kmod.h+2−2
@@ -32,8 +32,8 @@ · 31 unmodified lines
3232 extern char modprobe_path[]; /* for sysctl */
3333 /* modprobe exit status on success, -ve on error. Return value
3434 * 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, ...);
3737 #define request_module(mod...) __request_module(true, mod)
3838 #define request_module_nowait(mod...) __request_module(false, mod)
3939 #define try_then_request_module(x, mod...) \
include/linux/kobject.h+12−14
@@ -72,8 +72,8 @@ struct kobject { · 71 unmodified lines
7272 unsigned int uevent_suppress:1;
7373 };
7474
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, ...);
7777 extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
7878 va_list vargs);
7979
@@ -83,15 +83,13 @@ static inline const char *kobject_name(const struct kobject *kobj) · 3 unmodified lines
8383 }
8484
8585 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, ...);
9593
9694 extern void kobject_del(struct kobject *kobj);
9795
@@ -212,8 +210,8 @@ int kobject_uevent(struct kobject *kobj, enum kobject_action action); · 114 unmodified lines
212210 int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
213211 char *envp[]);
214212
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, ...);
217215
218216 int kobject_action_type(const char *buf, size_t count,
219217 enum kobject_action *type);
@@ -226,7 +224,7 @@ static inline int kobject_uevent_env(struct kobject *kobj, · 6 unmodified lines
226224 char *envp[])
227225 { return 0; }
228226
229−static inline __attribute__((format(printf, 2, 3)))
227+static inline __printf(2, 3)
230228 int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)
231229 { return 0; }
232230
include/linux/kthread.h+2−2
@@ -4,11 +4,11 @@ · 3 unmodified lines
44 #include <linux/err.h>
55 #include <linux/sched.h>
66
7+__printf(4, 5)
78 struct task_struct *kthread_create_on_node(int (*threadfn)(void *data),
89 void *data,
910 int node,
10− const char namefmt[], ...)
11− __attribute__((format(printf, 4, 5)));
11+ const char namefmt[], ...);
1212
1313 #define kthread_create(threadfn, data, namefmt, arg...) \
1414 kthread_create_on_node(threadfn, data, -1, namefmt, ##arg)
include/linux/libata.h+9−9
@@ -1256,13 +1256,13 @@ static inline int sata_srst_pmp(struct ata_link *link) · 1255 unmodified lines
12561256 /*
12571257 * printk helpers
12581258 */
1259−__attribute__((format (printf, 3, 4)))
1259+__printf(3, 4)
12601260 int ata_port_printk(const struct ata_port *ap, const char *level,
12611261 const char *fmt, ...);
1262−__attribute__((format (printf, 3, 4)))
1262+__printf(3, 4)
12631263 int ata_link_printk(const struct ata_link *link, const char *level,
12641264 const char *fmt, ...);
1265−__attribute__((format (printf, 3, 4)))
1265+__printf(3, 4)
12661266 int ata_dev_printk(const struct ata_device *dev, const char *level,
12671267 const char *fmt, ...);
12681268
@@ -1304,10 +1304,10 @@ void ata_print_version(const struct device *dev, const char *version); · 35 unmodified lines
13041304 /*
13051305 * ata_eh_info helpers
13061306 */
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, ...);
13111311 extern void ata_ehi_clear_desc(struct ata_eh_info *ehi);
13121312
13131313 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
13211321 /*
13221322 * port description helpers
13231323 */
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, ...);
13261326 #ifdef CONFIG_PCI
13271327 extern void ata_port_pbar_desc(struct ata_port *ap, int bar, ssize_t offset,
13281328 const char *name);
include/linux/mmiotrace.h+2−6
@@ -49,8 +49,7 @@ extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size, · 48 unmodified lines
4949 extern void mmiotrace_iounmap(volatile void __iomem *addr);
5050
5151 /* 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, ...);
5453 #else /* !CONFIG_MMIOTRACE: */
5554 static inline int is_kmmio_active(void)
5655 {
@@ -71,10 +70,7 @@ static inline void mmiotrace_iounmap(volatile void __iomem *addr) · 14 unmodified lines
7170 {
7271 }
7372
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, ...)
7874 {
7975 return 0;
8076 }
include/linux/netdevice.h+17−17
@@ -2622,23 +2622,23 @@ static inline const char *netdev_name(const struct net_device *dev) · 2621 unmodified lines
26222622 extern int __netdev_printk(const char *level, const struct net_device *dev,
26232623 struct va_format *vaf);
26242624
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, ...);
26422642
26432643 #define MODULE_ALIAS_NETDEV(device) \
26442644 MODULE_ALIAS("netdev-" device)
include/linux/printk.h+6−6
@@ -82,22 +82,22 @@ struct va_format { · 81 unmodified lines
8282 * Dummy printk for disabled debugging statements to use whilst maintaining
8383 * gcc's format and side-effect checking.
8484 */
85−static inline __attribute__ ((format (printf, 1, 2)))
85+static inline __printf(1, 2)
8686 int no_printk(const char *fmt, ...)
8787 {
8888 return 0;
8989 }
9090
91−extern asmlinkage __attribute__ ((format (printf, 1, 2)))
91+extern asmlinkage __printf(1, 2)
9292 void early_printk(const char *fmt, ...);
9393
9494 extern int printk_needs_cpu(int cpu);
9595 extern void printk_tick(void);
9696
9797 #ifdef CONFIG_PRINTK
98−asmlinkage __attribute__ ((format (printf, 1, 0)))
98+asmlinkage __printf(1, 0)
9999 int vprintk(const char *fmt, va_list args);
100−asmlinkage __attribute__ ((format (printf, 1, 2))) __cold
100+asmlinkage __printf(1, 2) __cold
101101 int printk(const char *fmt, ...);
102102
103103 /*
@@ -117,12 +117,12 @@ extern int kptr_restrict; · 13 unmodified lines
117117 void log_buf_kexec_setup(void);
118118 void __init setup_log_buf(int early);
119119 #else
120−static inline __attribute__ ((format (printf, 1, 0)))
120+static inline __printf(1, 0)
121121 int vprintk(const char *s, va_list args)
122122 {
123123 return 0;
124124 }
125−static inline __attribute__ ((format (printf, 1, 2))) __cold
125+static inline __printf(1, 2) __cold
126126 int printk(const char *s, ...)
127127 {
128128 return 0;
include/linux/quotaops.h+1−1
@@ -31,7 +31,7 @@ static inline bool is_quota_modification(struct inode *inode, struct iattr *ia) · 30 unmodified lines
3131 #define quota_error(sb, fmt, args...) \
3232 __quota_error((sb), __func__, fmt , ## args)
3333
34−extern __attribute__((format (printf, 3, 4)))
34+extern __printf(3, 4)
3535 void __quota_error(struct super_block *sb, const char *func,
3636 const char *fmt, ...);
3737
include/linux/seq_file.h+1−2
@@ -84,8 +84,7 @@ int seq_putc(struct seq_file *m, char c); · 83 unmodified lines
8484 int seq_puts(struct seq_file *m, const char *s);
8585 int seq_write(struct seq_file *seq, const void *data, size_t len);
8686
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 *, ...);
8988
9089 int seq_path(struct seq_file *, struct path *, char *);
9190 int seq_dentry(struct seq_file *, struct dentry *, char *);
include/linux/trace_seq.h+4−4
@@ -29,10 +29,10 @@ trace_seq_init(struct trace_seq *s) · 28 unmodified lines
2929 * Currently only defined when tracing is enabled.
3030 */
3131 #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);
3636 extern int
3737 trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary);
3838 extern int trace_print_seq(struct seq_file *m, struct trace_seq *s);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t