summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-07-17 13:40:18 -0400
committerTheodore Ts'o <tytso@mit.edu>2012-07-19 10:38:48 -0400
commitd554a3f9d3f3b0bb2faefad712e6d0dbd7c82ba6 (patch)
tree9ddcbd6c91ffa7d7f764114c922e5c8b9ac43967 /drivers/power
parentd38a0149e8a11ca333c1a6c489a2ccac2b73f2cb (diff)
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>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/pda_power.c6
1 files changed, 1 insertions, 5 deletions
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;