Commit 88862eeb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-printf-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace 

Pull bprintf() removal from Steven Rostedt:

 - Remove unused bprintf() function, that was added with the rest of the
   "bin-printf" functions.

   These are functions that are used by trace_printk() that allows to
   quickly save the format and arguments into the ring buffer without
   the expensive processing of converting numbers to ASCII. Then on
   output, at a much later time, the ring buffer is read and the string
   processing occurs then. The bprintf() was added for consistency but
   was never used. It can be safely removed.

* tag 'trace-printf-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  printf: Remove unused 'bprintf'
parents f788b5ef f69e6375

include/linux/string.h

+0 −1
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ int __sysfs_match_string(const char * const *array, size_t n, const char *s); 
#ifdef CONFIG_BINARY_PRINTF

int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args);

int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf);

int bprintf(u32 *bin_buf, size_t size, const char *fmt, ...) __printf(3, 4);

#endif



extern ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos,

lib/vsprintf.c

+0 −23
Original line number Diff line number Diff line
@@ -3428,29 +3428,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) 
}

EXPORT_SYMBOL_GPL(bstr_printf);



/**

 * bprintf - Parse a format string and place args' binary value in a buffer

 * @bin_buf: The buffer to place args' binary value

 * @size: The size of the buffer(by words(32bits), not characters)

 * @fmt: The format string to use

 * @...: Arguments for the format string

 *

 * The function returns the number of words(u32) written

 * into @bin_buf.

 */

int bprintf(u32 *bin_buf, size_t size, const char *fmt, ...)

{

	va_list args;

	int ret;



	va_start(args, fmt);

	ret = vbin_printf(bin_buf, size, fmt, args);

	va_end(args);



	return ret;

}

EXPORT_SYMBOL_GPL(bprintf);



#endif /* CONFIG_BINARY_PRINTF */



/**