From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 17 Jul 2012 17:40:18 +0000 (-0400)
Subject: pda_power: remove IRQF_SAMPLE_RANDOM which is now a no-op
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d554a3f9d3f3b0bb2faefad712e6d0dbd7c82ba6;p=linux-beck.git

pda_power: remove IRQF_SAMPLE_RANDOM which is now a no-op

With the changes in the random tree, IRQF_SAMPLE_RANDOM is now a
no-op; interrupt randomness is now collected unconditionally in a very
low-overhead fashion; see commit 775f4b297b.  The IRQF_SAMPLE_RANDOM
flag was scheduled to be removed in 2009 on the
feature-removal-schedule, so this patch is preparation for the final
removal of this flag.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Acked-by: Anton Vorontsov <cbou@mail.ru>
Cc: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index 214468f4444a..db5c526154d0 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -24,11 +24,7 @@
 
 static inline unsigned int get_irq_flags(struct resource *res)
 {
-	unsigned int flags = IRQF_SAMPLE_RANDOM | IRQF_SHARED;
-
-	flags |= res->flags & IRQF_TRIGGER_MASK;
-
-	return flags;
+	return IRQF_SHARED | (res->flags & IRQF_TRIGGER_MASK);
 }
 
 static struct device *dev;