Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2f983570010a0dcb26d988da02d7ccfad00c807c

Authored by Yinghai Lu
Committed by Linus Torvalds
1 parent e9e67a8b57
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

sparseirq: move set/get_timer_rand_state back to .c 

those two functions only used in that C file

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 34 additions and 56 deletions Side-by-side Diff

drivers/char/random.c
Diff comments   View file @ 2f98357
... ... @@ -559,7 +559,40 @@
559 559 };
560 560  
561 561 #ifndef CONFIG_SPARSE_IRQ
562   -struct timer_rand_state *irq_timer_state[NR_IRQS];
  562 +
  563 +static struct timer_rand_state *irq_timer_state[NR_IRQS];
  564 +
  565 +static struct timer_rand_state *get_timer_rand_state(unsigned int irq)
  566 +{
  567 + return irq_timer_state[irq];
  568 +}
  569 +
  570 +static void set_timer_rand_state(unsigned int irq,
  571 + struct timer_rand_state *state)
  572 +{
  573 + irq_timer_state[irq] = state;
  574 +}
  575 +
  576 +#else
  577 +
  578 +static struct timer_rand_state *get_timer_rand_state(unsigned int irq)
  579 +{
  580 + struct irq_desc *desc;
  581 +
  582 + desc = irq_to_desc(irq);
  583 +
  584 + return desc->timer_rand_state;
  585 +}
  586 +
  587 +static void set_timer_rand_state(unsigned int irq,
  588 + struct timer_rand_state *state)
  589 +{
  590 + struct irq_desc *desc;
  591 +
  592 + desc = irq_to_desc(irq);
  593 +
  594 + desc->timer_rand_state = state;
  595 +}
563 596 #endif
564 597  
565 598 static struct timer_rand_state input_timer_state;
... ... @@ -918,11 +951,6 @@
918 951 void rand_initialize_irq(int irq)
919 952 {
920 953 struct timer_rand_state *state;
921   -
922   -#ifndef CONFIG_SPARSE_IRQ
923   - if (irq >= nr_irqs)
924   - return;
925   -#endif
926 954  
927 955 state = get_timer_rand_state(irq);
928 956  
include/linux/random.h
Diff comments   View file @ 2f98357
... ... @@ -45,56 +45,6 @@
45 45  
46 46 extern void rand_initialize_irq(int irq);
47 47  
48   -struct timer_rand_state;
49   -#ifndef CONFIG_SPARSE_IRQ
50   -
51   -extern struct timer_rand_state *irq_timer_state[];
52   -
53   -static inline struct timer_rand_state *get_timer_rand_state(unsigned int irq)
54   -{
55   - if (irq >= nr_irqs)
56   - return NULL;
57   -
58   - return irq_timer_state[irq];
59   -}
60   -
61   -static inline void set_timer_rand_state(unsigned int irq, struct timer_rand_state *state)
62   -{
63   - if (irq >= nr_irqs)
64   - return;
65   -
66   - irq_timer_state[irq] = state;
67   -}
68   -
69   -#else
70   -
71   -#include <linux/irq.h>
72   -static inline struct timer_rand_state *get_timer_rand_state(unsigned int irq)
73   -{
74   - struct irq_desc *desc;
75   -
76   - desc = irq_to_desc(irq);
77   -
78   - if (!desc)
79   - return NULL;
80   -
81   - return desc->timer_rand_state;
82   -}
83   -
84   -static inline void set_timer_rand_state(unsigned int irq, struct timer_rand_state *state)
85   -{
86   - struct irq_desc *desc;
87   -
88   - desc = irq_to_desc(irq);
89   -
90   - if (!desc)
91   - return;
92   -
93   - desc->timer_rand_state = state;
94   -}
95   -#endif
96   -
97   -
98 48 extern void add_input_randomness(unsigned int type, unsigned int code,
99 49 unsigned int value);
100 50 extern void add_interrupt_randomness(int irq);