Commit 2f983570 authored by Yinghai Lu's avatar Yinghai Lu Committed by Linus Torvalds
Browse files

sparseirq: move set/get_timer_rand_state back to .c 



those two functions only used in that C file

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e9e67a8b

drivers/char/random.c

+34 −6
Original line number Diff line number Diff line
@@ -559,7 +559,40 @@ struct timer_rand_state { 
};



#ifndef CONFIG_SPARSE_IRQ

struct timer_rand_state *irq_timer_state[NR_IRQS];



static struct timer_rand_state *irq_timer_state[NR_IRQS];



static struct timer_rand_state *get_timer_rand_state(unsigned int irq)

{

	return irq_timer_state[irq];

}



static void set_timer_rand_state(unsigned int irq,

				 struct timer_rand_state *state)

{

	irq_timer_state[irq] = state;

}



#else



static struct timer_rand_state *get_timer_rand_state(unsigned int irq)

{

	struct irq_desc *desc;



	desc = irq_to_desc(irq);



	return desc->timer_rand_state;

}



static void set_timer_rand_state(unsigned int irq,

				 struct timer_rand_state *state)

{

	struct irq_desc *desc;



	desc = irq_to_desc(irq);



	desc->timer_rand_state = state;

}

#endif



static struct timer_rand_state input_timer_state;
@@ -919,11 +952,6 @@ void rand_initialize_irq(int irq) 
{

	struct timer_rand_state *state;



#ifndef CONFIG_SPARSE_IRQ

	if (irq >= nr_irqs)

		return;

#endif



	state = get_timer_rand_state(irq);



	if (state)

include/linux/random.h

+0 −50
Original line number Diff line number Diff line
@@ -45,56 +45,6 @@ struct rand_pool_info { 


extern void rand_initialize_irq(int irq);



struct timer_rand_state;

#ifndef CONFIG_SPARSE_IRQ



extern struct timer_rand_state *irq_timer_state[];



static inline struct timer_rand_state *get_timer_rand_state(unsigned int irq)

{

	if (irq >= nr_irqs)

		return NULL;



	return irq_timer_state[irq];

}



static inline void set_timer_rand_state(unsigned int irq, struct timer_rand_state *state)

{

	if (irq >= nr_irqs)

		return;



	irq_timer_state[irq] = state;

}



#else



#include <linux/irq.h>

static inline struct timer_rand_state *get_timer_rand_state(unsigned int irq)

{

	struct irq_desc *desc;



	desc = irq_to_desc(irq);



	if (!desc)

		return NULL;



	return desc->timer_rand_state;

}



static inline void set_timer_rand_state(unsigned int irq, struct timer_rand_state *state)

{

	struct irq_desc *desc;



	desc = irq_to_desc(irq);



	if (!desc)

		return;



	desc->timer_rand_state = state;

}

#endif





extern void add_input_randomness(unsigned int type, unsigned int code,

				 unsigned int value);

extern void add_interrupt_randomness(int irq);