diff options
author | Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> | 2015-01-04 10:32:45 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-07 07:15:15 -0400 |
commit | c8c7c44b7cf5ef7163e4bd6aedbdeb6f6031ee3e (patch) | |
tree | a4bc95af5a3944095ede6ec2809cf552e9e8d0c4 | |
parent | 12b055662ac6216c518d7ec09bf2f7d75435015c (diff) |
[media] s5p-jpeg: Remove some unused functions
Removes some functions that are not used anywhere:
s5p_jpeg_input_raw_y16() s5p_jpeg_timer_disable() s5p_jpeg_timer_enable().
This was partially found by using a static code analysis program called
cppcheck.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c | 32 | ||||
-rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h | 3 |
2 files changed, 0 insertions, 35 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c b/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c index e3b8e67e005f..b5f20e722b63 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c | |||
@@ -51,18 +51,6 @@ void s5p_jpeg_input_raw_mode(void __iomem *regs, unsigned long mode) | |||
51 | writel(reg, regs + S5P_JPGCMOD); | 51 | writel(reg, regs + S5P_JPGCMOD); |
52 | } | 52 | } |
53 | 53 | ||
54 | void s5p_jpeg_input_raw_y16(void __iomem *regs, bool y16) | ||
55 | { | ||
56 | unsigned long reg; | ||
57 | |||
58 | reg = readl(regs + S5P_JPGCMOD); | ||
59 | if (y16) | ||
60 | reg |= S5P_MODE_Y16; | ||
61 | else | ||
62 | reg &= ~S5P_MODE_Y16_MASK; | ||
63 | writel(reg, regs + S5P_JPGCMOD); | ||
64 | } | ||
65 | |||
66 | void s5p_jpeg_proc_mode(void __iomem *regs, unsigned long mode) | 54 | void s5p_jpeg_proc_mode(void __iomem *regs, unsigned long mode) |
67 | { | 55 | { |
68 | unsigned long reg, m; | 56 | unsigned long reg, m; |
@@ -208,26 +196,6 @@ void s5p_jpeg_final_mcu_num_int_enable(void __iomem *regs, bool enbl) | |||
208 | writel(reg, regs + S5P_JPGINTSE); | 196 | writel(reg, regs + S5P_JPGINTSE); |
209 | } | 197 | } |
210 | 198 | ||
211 | void s5p_jpeg_timer_enable(void __iomem *regs, unsigned long val) | ||
212 | { | ||
213 | unsigned long reg; | ||
214 | |||
215 | reg = readl(regs + S5P_JPG_TIMER_SE); | ||
216 | reg |= S5P_TIMER_INT_EN; | ||
217 | reg &= ~S5P_TIMER_INIT_MASK; | ||
218 | reg |= val & S5P_TIMER_INIT_MASK; | ||
219 | writel(reg, regs + S5P_JPG_TIMER_SE); | ||
220 | } | ||
221 | |||
222 | void s5p_jpeg_timer_disable(void __iomem *regs) | ||
223 | { | ||
224 | unsigned long reg; | ||
225 | |||
226 | reg = readl(regs + S5P_JPG_TIMER_SE); | ||
227 | reg &= ~S5P_TIMER_INT_EN_MASK; | ||
228 | writel(reg, regs + S5P_JPG_TIMER_SE); | ||
229 | } | ||
230 | |||
231 | int s5p_jpeg_timer_stat(void __iomem *regs) | 199 | int s5p_jpeg_timer_stat(void __iomem *regs) |
232 | { | 200 | { |
233 | return (int)((readl(regs + S5P_JPG_TIMER_ST) & S5P_TIMER_INT_STAT_MASK) | 201 | return (int)((readl(regs + S5P_JPG_TIMER_ST) & S5P_TIMER_INT_STAT_MASK) |
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h b/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h index c11ebe86b9c9..f208fa3ed738 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h +++ b/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h | |||
@@ -29,7 +29,6 @@ | |||
29 | void s5p_jpeg_reset(void __iomem *regs); | 29 | void s5p_jpeg_reset(void __iomem *regs); |
30 | void s5p_jpeg_poweron(void __iomem *regs); | 30 | void s5p_jpeg_poweron(void __iomem *regs); |
31 | void s5p_jpeg_input_raw_mode(void __iomem *regs, unsigned long mode); | 31 | void s5p_jpeg_input_raw_mode(void __iomem *regs, unsigned long mode); |
32 | void s5p_jpeg_input_raw_y16(void __iomem *regs, bool y16); | ||
33 | void s5p_jpeg_proc_mode(void __iomem *regs, unsigned long mode); | 32 | void s5p_jpeg_proc_mode(void __iomem *regs, unsigned long mode); |
34 | void s5p_jpeg_subsampling_mode(void __iomem *regs, unsigned int mode); | 33 | void s5p_jpeg_subsampling_mode(void __iomem *regs, unsigned int mode); |
35 | unsigned int s5p_jpeg_get_subsampling_mode(void __iomem *regs); | 34 | unsigned int s5p_jpeg_get_subsampling_mode(void __iomem *regs); |
@@ -42,8 +41,6 @@ void s5p_jpeg_x(void __iomem *regs, unsigned int x); | |||
42 | void s5p_jpeg_rst_int_enable(void __iomem *regs, bool enable); | 41 | void s5p_jpeg_rst_int_enable(void __iomem *regs, bool enable); |
43 | void s5p_jpeg_data_num_int_enable(void __iomem *regs, bool enable); | 42 | void s5p_jpeg_data_num_int_enable(void __iomem *regs, bool enable); |
44 | void s5p_jpeg_final_mcu_num_int_enable(void __iomem *regs, bool enbl); | 43 | void s5p_jpeg_final_mcu_num_int_enable(void __iomem *regs, bool enbl); |
45 | void s5p_jpeg_timer_enable(void __iomem *regs, unsigned long val); | ||
46 | void s5p_jpeg_timer_disable(void __iomem *regs); | ||
47 | int s5p_jpeg_timer_stat(void __iomem *regs); | 44 | int s5p_jpeg_timer_stat(void __iomem *regs); |
48 | void s5p_jpeg_clear_timer_stat(void __iomem *regs); | 45 | void s5p_jpeg_clear_timer_stat(void __iomem *regs); |
49 | void s5p_jpeg_enc_stream_int(void __iomem *regs, unsigned long size); | 46 | void s5p_jpeg_enc_stream_int(void __iomem *regs, unsigned long size); |