Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14673764 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

[ARM] pxa: 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 775f4b29.  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: default avatar"Theodore Ts'o" <tytso@mit.edu>
Acked-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
parent 9863fa6c

arch/arm/mach-pxa/lubbock.c

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static int lubbock_mci_init(struct device *dev, 
	init_timer(&mmc_timer);

	mmc_timer.data = (unsigned long) data;

	return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int,

			IRQF_SAMPLE_RANDOM, "lubbock-sd-detect", data);

			   0, "lubbock-sd-detect", data);

}



static int lubbock_mci_get_ro(struct device *dev)

arch/arm/mach-pxa/magician.c

+2 −3
Original line number Diff line number Diff line
@@ -633,8 +633,7 @@ static struct platform_device bq24022 = { 
static int magician_mci_init(struct device *dev,

				irq_handler_t detect_irq, void *data)

{

	return request_irq(IRQ_MAGICIAN_SD, detect_irq,

				IRQF_DISABLED | IRQF_SAMPLE_RANDOM,

	return request_irq(IRQ_MAGICIAN_SD, detect_irq, IRQF_DISABLED,

			   "mmc card detect", data);

}

arch/arm/mach-pxa/trizeps4.c

+2 −2
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static int trizeps4_mci_init(struct device *dev, irq_handler_t mci_detect_int, 
	int err;



	err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int,

		IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_SAMPLE_RANDOM,

			  IRQF_DISABLED | IRQF_TRIGGER_RISING,

			  "MMC card detect", data);

	if (err) {

		printk(KERN_ERR "trizeps4_mci_init: MMC/SD: can't request"