Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: v4l2-jpeg: Remove unused v4l2_jpeg_parse_* wrappers

The functions:
v4l2_jpeg_parse_huffman_tables()
v4l2_jpeg_parse_quantization_tables()
v4l2_jpeg_parse_scan_header()
and
v4l2_jpeg_parse_frame_header()

were added in 2020 by
commit 50733b5b9102 ("media: add v4l2 JPEG helpers")

but have remained unused.

Remove them.

They're all just wrappers around an underlying set of helpers,
which are all still called via v4l2_jpeg_parse_header().

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

authored by

Dr. David Alan Gilbert and committed by
Hans Verkuil
c3021d6a 9314891d

-89
-80
drivers/media/v4l2-core/v4l2-jpeg.c
··· 711 711 return marker; 712 712 } 713 713 EXPORT_SYMBOL_GPL(v4l2_jpeg_parse_header); 714 - 715 - /** 716 - * v4l2_jpeg_parse_frame_header - parse frame header 717 - * @buf: address of the frame header, after the SOF0 marker 718 - * @len: length of the frame header 719 - * @frame_header: returns the parsed frame header 720 - * 721 - * Returns 0 or negative error if parsing failed. 722 - */ 723 - int v4l2_jpeg_parse_frame_header(void *buf, size_t len, 724 - struct v4l2_jpeg_frame_header *frame_header) 725 - { 726 - struct jpeg_stream stream; 727 - 728 - stream.curr = buf; 729 - stream.end = stream.curr + len; 730 - return jpeg_parse_frame_header(&stream, SOF0, frame_header); 731 - } 732 - EXPORT_SYMBOL_GPL(v4l2_jpeg_parse_frame_header); 733 - 734 - /** 735 - * v4l2_jpeg_parse_scan_header - parse scan header 736 - * @buf: address of the scan header, after the SOS marker 737 - * @len: length of the scan header 738 - * @scan_header: returns the parsed scan header 739 - * 740 - * Returns 0 or negative error if parsing failed. 741 - */ 742 - int v4l2_jpeg_parse_scan_header(void *buf, size_t len, 743 - struct v4l2_jpeg_scan_header *scan_header) 744 - { 745 - struct jpeg_stream stream; 746 - 747 - stream.curr = buf; 748 - stream.end = stream.curr + len; 749 - return jpeg_parse_scan_header(&stream, scan_header); 750 - } 751 - EXPORT_SYMBOL_GPL(v4l2_jpeg_parse_scan_header); 752 - 753 - /** 754 - * v4l2_jpeg_parse_quantization_tables - parse quantization tables segment 755 - * @buf: address of the quantization table segment, after the DQT marker 756 - * @len: length of the quantization table segment 757 - * @precision: sample precision (P) in bits per component 758 - * @q_tables: returns four references into the buffer for the 759 - * four possible quantization table destinations 760 - * 761 - * Returns 0 or negative error if parsing failed. 762 - */ 763 - int v4l2_jpeg_parse_quantization_tables(void *buf, size_t len, u8 precision, 764 - struct v4l2_jpeg_reference *q_tables) 765 - { 766 - struct jpeg_stream stream; 767 - 768 - stream.curr = buf; 769 - stream.end = stream.curr + len; 770 - return jpeg_parse_quantization_tables(&stream, precision, q_tables); 771 - } 772 - EXPORT_SYMBOL_GPL(v4l2_jpeg_parse_quantization_tables); 773 - 774 - /** 775 - * v4l2_jpeg_parse_huffman_tables - parse huffman tables segment 776 - * @buf: address of the Huffman table segment, after the DHT marker 777 - * @len: length of the Huffman table segment 778 - * @huffman_tables: returns four references into the buffer for the 779 - * four possible Huffman table destinations, in 780 - * the order DC0, DC1, AC0, AC1 781 - * 782 - * Returns 0 or negative error if parsing failed. 783 - */ 784 - int v4l2_jpeg_parse_huffman_tables(void *buf, size_t len, 785 - struct v4l2_jpeg_reference *huffman_tables) 786 - { 787 - struct jpeg_stream stream; 788 - 789 - stream.curr = buf; 790 - stream.end = stream.curr + len; 791 - return jpeg_parse_huffman_tables(&stream, huffman_tables); 792 - } 793 - EXPORT_SYMBOL_GPL(v4l2_jpeg_parse_huffman_tables);
-9
include/media/v4l2-jpeg.h
··· 169 169 170 170 int v4l2_jpeg_parse_header(void *buf, size_t len, struct v4l2_jpeg_header *out); 171 171 172 - int v4l2_jpeg_parse_frame_header(void *buf, size_t len, 173 - struct v4l2_jpeg_frame_header *frame_header); 174 - int v4l2_jpeg_parse_scan_header(void *buf, size_t len, 175 - struct v4l2_jpeg_scan_header *scan_header); 176 - int v4l2_jpeg_parse_quantization_tables(void *buf, size_t len, u8 precision, 177 - struct v4l2_jpeg_reference *q_tables); 178 - int v4l2_jpeg_parse_huffman_tables(void *buf, size_t len, 179 - struct v4l2_jpeg_reference *huffman_tables); 180 - 181 172 extern const u8 v4l2_jpeg_zigzag_scan_index[V4L2_JPEG_PIXELS_IN_BLOCK]; 182 173 extern const u8 v4l2_jpeg_ref_table_luma_qt[V4L2_JPEG_PIXELS_IN_BLOCK]; 183 174 extern const u8 v4l2_jpeg_ref_table_chroma_qt[V4L2_JPEG_PIXELS_IN_BLOCK];