diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/random.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 60c9c7ee6b2c..9ce80213007b 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
@@ -558,8 +558,6 @@ struct timer_rand_state { | |||
558 | unsigned dont_count_entropy:1; | 558 | unsigned dont_count_entropy:1; |
559 | }; | 559 | }; |
560 | 560 | ||
561 | #ifndef CONFIG_HAVE_SPARSE_IRQ | ||
562 | |||
563 | #ifdef CONFIG_HAVE_DYN_ARRAY | 561 | #ifdef CONFIG_HAVE_DYN_ARRAY |
564 | static struct timer_rand_state **irq_timer_state; | 562 | static struct timer_rand_state **irq_timer_state; |
565 | DEFINE_DYN_ARRAY(irq_timer_state, sizeof(struct timer_rand_state *), nr_irqs, PAGE_SIZE, NULL); | 563 | DEFINE_DYN_ARRAY(irq_timer_state, sizeof(struct timer_rand_state *), nr_irqs, PAGE_SIZE, NULL); |
@@ -583,33 +581,6 @@ static void set_timer_rand_state(unsigned int irq, struct timer_rand_state *stat | |||
583 | irq_timer_state[irq] = state; | 581 | irq_timer_state[irq] = state; |
584 | } | 582 | } |
585 | 583 | ||
586 | #else | ||
587 | |||
588 | static struct timer_rand_state *get_timer_rand_state(unsigned int irq) | ||
589 | { | ||
590 | struct irq_desc *desc; | ||
591 | |||
592 | desc = irq_to_desc(irq); | ||
593 | |||
594 | if (!desc) | ||
595 | return NULL; | ||
596 | |||
597 | return desc->timer_rand_state; | ||
598 | } | ||
599 | |||
600 | static void set_timer_rand_state(unsigned int irq, struct timer_rand_state *state) | ||
601 | { | ||
602 | struct irq_desc *desc; | ||
603 | |||
604 | desc = irq_to_desc(irq); | ||
605 | |||
606 | if (!desc) | ||
607 | return; | ||
608 | |||
609 | desc->timer_rand_state = state; | ||
610 | } | ||
611 | #endif | ||
612 | |||
613 | static struct timer_rand_state input_timer_state; | 584 | static struct timer_rand_state input_timer_state; |
614 | 585 | ||
615 | /* | 586 | /* |
@@ -967,10 +938,8 @@ void rand_initialize_irq(int irq) | |||
967 | { | 938 | { |
968 | struct timer_rand_state *state; | 939 | struct timer_rand_state *state; |
969 | 940 | ||
970 | #ifndef CONFIG_HAVE_SPARSE_IRQ | ||
971 | if (irq >= nr_irqs) | 941 | if (irq >= nr_irqs) |
972 | return; | 942 | return; |
973 | #endif | ||
974 | 943 | ||
975 | state = get_timer_rand_state(irq); | 944 | state = get_timer_rand_state(irq); |
976 | 945 | ||