aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-07-17 14:00:26 -0400
committerTheodore Ts'o <tytso@mit.edu>2012-07-19 10:39:56 -0400
commit8de1ee8f93fb756000176f916fd0681b47ceb292 (patch)
tree62b43f960db46c3cf5c39da27979f8d04ada8e58 /drivers
parent9728276835f319e32e2571fb0fb18777237de87c (diff)
pxa25x_udc: 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: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: Eric Miao <eric.y.miao@gmail.com> Cc: Russell King <linux@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/pxa25x_udc.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index f7ff9e8e746a..c319814ad120 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -2200,19 +2200,15 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
2200 2200
2201#ifdef CONFIG_ARCH_LUBBOCK 2201#ifdef CONFIG_ARCH_LUBBOCK
2202 if (machine_is_lubbock()) { 2202 if (machine_is_lubbock()) {
2203 retval = request_irq(LUBBOCK_USB_DISC_IRQ, 2203 retval = request_irq(LUBBOCK_USB_DISC_IRQ, lubbock_vbus_irq,
2204 lubbock_vbus_irq, 2204 0, driver_name, dev);
2205 IRQF_SAMPLE_RANDOM,
2206 driver_name, dev);
2207 if (retval != 0) { 2205 if (retval != 0) {
2208 pr_err("%s: can't get irq %i, err %d\n", 2206 pr_err("%s: can't get irq %i, err %d\n",
2209 driver_name, LUBBOCK_USB_DISC_IRQ, retval); 2207 driver_name, LUBBOCK_USB_DISC_IRQ, retval);
2210 goto err_irq_lub; 2208 goto err_irq_lub;
2211 } 2209 }
2212 retval = request_irq(LUBBOCK_USB_IRQ, 2210 retval = request_irq(LUBBOCK_USB_IRQ, lubbock_vbus_irq,
2213 lubbock_vbus_irq, 2211 0, driver_name, dev);
2214 IRQF_SAMPLE_RANDOM,
2215 driver_name, dev);
2216 if (retval != 0) { 2212 if (retval != 0) {
2217 pr_err("%s: can't get irq %i, err %d\n", 2213 pr_err("%s: can't get irq %i, err %d\n",
2218 driver_name, LUBBOCK_USB_IRQ, retval); 2214 driver_name, LUBBOCK_USB_IRQ, retval);