tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ARM] Remove asm/irq.h includes from ARM drivers

Many ARM drivers do not need to include asm/irq.h - remove this
unnecessary include from some ARM drivers.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Russell King and committed by
Russell King e9368f82 63dcf0ad

+10 -16
-1
drivers/amba/bus.c
··· 15 15 #include <linux/amba/bus.h> 16 16 17 17 #include <asm/io.h> 18 - #include <asm/irq.h> 19 18 #include <asm/sizes.h> 20 19 21 20 #define to_amba_device(d) container_of(d, struct amba_device, dev)
-1
drivers/input/serio/sa1111ps2.c
··· 20 20 #include <linux/spinlock.h> 21 21 22 22 #include <asm/io.h> 23 - #include <asm/irq.h> 24 23 #include <asm/system.h> 25 24 26 25 #include <asm/hardware/sa1111.h>
-1
drivers/net/arm/ether3.c
··· 69 69 #include <asm/system.h> 70 70 #include <asm/ecard.h> 71 71 #include <asm/io.h> 72 - #include <asm/irq.h> 73 72 74 73 static char version[] __initdata = "ether3 ethernet driver (c) 1995-2000 R.M.King v1.17\n"; 75 74
-1
drivers/net/arm/etherh.c
··· 50 50 #include <asm/system.h> 51 51 #include <asm/ecard.h> 52 52 #include <asm/io.h> 53 - #include <asm/irq.h> 54 53 55 54 #include "../8390.h" 56 55
-1
drivers/scsi/arm/acornscsi.c
··· 146 146 147 147 #include <asm/system.h> 148 148 #include <asm/io.h> 149 - #include <asm/irq.h> 150 149 #include <asm/ecard.h> 151 150 152 151 #include "../scsi.h"
-1
drivers/scsi/arm/arxescsi.c
··· 33 33 34 34 #include <asm/dma.h> 35 35 #include <asm/io.h> 36 - #include <asm/irq.h> 37 36 #include <asm/ecard.h> 38 37 39 38 #include "../scsi.h"
-1
drivers/scsi/arm/cumana_1.c
··· 13 13 14 14 #include <asm/ecard.h> 15 15 #include <asm/io.h> 16 - #include <asm/irq.h> 17 16 #include <asm/system.h> 18 17 19 18 #include "../scsi.h"
-1
drivers/scsi/arm/cumana_2.c
··· 31 31 #include <asm/dma.h> 32 32 #include <asm/ecard.h> 33 33 #include <asm/io.h> 34 - #include <asm/irq.h> 35 34 #include <asm/pgtable.h> 36 35 37 36 #include "../scsi.h"
-1
drivers/scsi/arm/eesox.c
··· 35 35 #include <linux/dma-mapping.h> 36 36 37 37 #include <asm/io.h> 38 - #include <asm/irq.h> 39 38 #include <asm/dma.h> 40 39 #include <asm/ecard.h> 41 40 #include <asm/pgtable.h>
-1
drivers/scsi/arm/powertec.c
··· 22 22 #include <asm/dma.h> 23 23 #include <asm/ecard.h> 24 24 #include <asm/io.h> 25 - #include <asm/irq.h> 26 25 #include <asm/pgtable.h> 27 26 28 27 #include "../scsi.h"
-1
drivers/video/cyber2000fb.c
··· 50 50 #include <linux/init.h> 51 51 52 52 #include <asm/io.h> 53 - #include <asm/irq.h> 54 53 #include <asm/pgtable.h> 55 54 #include <asm/system.h> 56 55 #include <asm/uaccess.h>
+10 -5
drivers/video/sa1100fb.c
··· 178 178 179 179 #include <asm/hardware.h> 180 180 #include <asm/io.h> 181 - #include <asm/irq.h> 182 181 #include <asm/mach-types.h> 183 182 #include <asm/uaccess.h> 184 183 #include <asm/arch/assabet.h> ··· 1454 1455 static int __init sa1100fb_probe(struct platform_device *pdev) 1455 1456 { 1456 1457 struct sa1100fb_info *fbi; 1457 - int ret; 1458 + int ret, irq; 1459 + 1460 + irq = platform_get_irq(pdev, 0); 1461 + if (irq <= 0) 1462 + return -EINVAL; 1458 1463 1459 1464 if (!request_mem_region(0xb0100000, 0x10000, "LCD")) 1460 1465 return -EBUSY; ··· 1473 1470 if (ret) 1474 1471 goto failed; 1475 1472 1476 - ret = request_irq(IRQ_LCD, sa1100fb_handle_irq, SA_INTERRUPT, 1473 + ret = request_irq(irq, sa1100fb_handle_irq, SA_INTERRUPT, 1477 1474 "LCD", fbi); 1478 1475 if (ret) { 1479 1476 printk(KERN_ERR "sa1100fb: request_irq failed: %d\n", ret); ··· 1495 1492 1496 1493 ret = register_framebuffer(&fbi->fb); 1497 1494 if (ret < 0) 1498 - goto failed; 1495 + goto err_free_irq; 1499 1496 1500 1497 #ifdef CONFIG_CPU_FREQ 1501 1498 fbi->freq_transition.notifier_call = sa1100fb_freq_transition; ··· 1507 1504 /* This driver cannot be unloaded at the moment */ 1508 1505 return 0; 1509 1506 1510 - failed: 1507 + err_free_irq: 1508 + free_irq(irq, fbi); 1509 + failed: 1511 1510 platform_set_drvdata(pdev, NULL); 1512 1511 kfree(fbi); 1513 1512 release_mem_region(0xb0100000, 0x10000);