[ARM] Remove asm/irq.h includes from ARM drivers
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 9 Jan 2006 13:56:42 +0000 (13:56 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 9 Jan 2006 13:56:42 +0000 (13:56 +0000)
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>
12 files changed:
drivers/amba/bus.c
drivers/input/serio/sa1111ps2.c
drivers/net/arm/ether3.c
drivers/net/arm/etherh.c
drivers/scsi/arm/acornscsi.c
drivers/scsi/arm/arxescsi.c
drivers/scsi/arm/cumana_1.c
drivers/scsi/arm/cumana_2.c
drivers/scsi/arm/eesox.c
drivers/scsi/arm/powertec.c
drivers/video/cyber2000fb.c
drivers/video/sa1100fb.c

index 1bbdd1693d5764430ba027a4291246358f9a29db..889855d8d9f9080ee9b98c3a1a1bcd0691006f59 100644 (file)
@@ -15,7 +15,6 @@
 #include <linux/amba/bus.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/sizes.h>
 
 #define to_amba_device(d)      container_of(d, struct amba_device, dev)
index 3f0df3330fb216b6bc3379fdc3a5c07104891ca8..ebd9976fc811b08efb2714ede9815c77936b0bd3 100644 (file)
@@ -20,7 +20,6 @@
 #include <linux/spinlock.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/system.h>
 
 #include <asm/hardware/sa1111.h>
index 1cc53abc3a3900a4f9b6b6dbabb839db43f679c8..f1d5b1027ff7ef81e432eeea641ec4bb0c750174 100644 (file)
@@ -69,7 +69,6 @@
 #include <asm/system.h>
 #include <asm/ecard.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 
 static char version[] __initdata = "ether3 ethernet driver (c) 1995-2000 R.M.King v1.17\n";
 
index 942a2819576c2efe229c6c6cb71fc4a9c9d79b4f..6a93b666eb7231c272fe8aa84424a1aa9be2e799 100644 (file)
@@ -50,7 +50,6 @@
 #include <asm/system.h>
 #include <asm/ecard.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 
 #include "../8390.h"
 
index 09ed05727bcbb7f972be03d471e26328fa87d90d..dda5a5f79c53297af2cd8ebaa6a64d884bde5971 100644 (file)
 
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/ecard.h>
 
 #include "../scsi.h"
index 804125e35fc3a20e05d6118bf8f9f7e0453d203c..a28940156703097e0349a0f5cc5900eaa62296e9 100644 (file)
@@ -33,7 +33,6 @@
 
 #include <asm/dma.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/ecard.h>
 
 #include "../scsi.h"
index 81e266be26d01ac77906a50f4a5773bd932748e0..e6c9491dc5c08656ea73ffb0d101b1610327efa0 100644 (file)
@@ -13,7 +13,6 @@
 
 #include <asm/ecard.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/system.h>
 
 #include "../scsi.h"
index 3a7a46b0dc41c9a065a7ed8b6ad613568d09024c..583d2d8c8335eba6b6924786984836c30d89e3df 100644 (file)
@@ -31,7 +31,6 @@
 #include <asm/dma.h>
 #include <asm/ecard.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/pgtable.h>
 
 #include "../scsi.h"
index 4d1e8f52c924ff1cf57eb5ad49def29641ba8803..3ffec7efc9d526b45413bbdeeab277fbc4277f58 100644 (file)
@@ -35,7 +35,6 @@
 #include <linux/dma-mapping.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/dma.h>
 #include <asm/ecard.h>
 #include <asm/pgtable.h>
index 3333d7b39139ee36a85b21740fa4134042327dd7..3113bdcedb1334dbbb54aff3bc78ac9ab3cd81ae 100644 (file)
@@ -22,7 +22,6 @@
 #include <asm/dma.h>
 #include <asm/ecard.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/pgtable.h>
 
 #include "../scsi.h"
index a9300f930ef2a3022390758efd4271606fc39f6b..55a3514157ed743e09035bdf9a866d8f7e942deb 100644 (file)
@@ -50,7 +50,6 @@
 #include <linux/init.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
index 2ea1354e439ff2d5e65a412fe2dbc1dfe41132c0..087e58689e4c46486bfde6331db3e6f37e8e33fe 100644 (file)
 
 #include <asm/hardware.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/uaccess.h>
 #include <asm/arch/assabet.h>
@@ -1455,7 +1454,11 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
 static int __init sa1100fb_probe(struct platform_device *pdev)
 {
        struct sa1100fb_info *fbi;
-       int ret;
+       int ret, irq;
+
+       irq = platform_get_irq(pdev, 0);
+       if (irq <= 0)
+               return -EINVAL;
 
        if (!request_mem_region(0xb0100000, 0x10000, "LCD"))
                return -EBUSY;
@@ -1470,7 +1473,7 @@ static int __init sa1100fb_probe(struct platform_device *pdev)
        if (ret)
                goto failed;
 
-       ret = request_irq(IRQ_LCD, sa1100fb_handle_irq, SA_INTERRUPT,
+       ret = request_irq(irq, sa1100fb_handle_irq, SA_INTERRUPT,
                          "LCD", fbi);
        if (ret) {
                printk(KERN_ERR "sa1100fb: request_irq failed: %d\n", ret);
@@ -1492,7 +1495,7 @@ static int __init sa1100fb_probe(struct platform_device *pdev)
 
        ret = register_framebuffer(&fbi->fb);
        if (ret < 0)
-               goto failed;
+               goto err_free_irq;
 
 #ifdef CONFIG_CPU_FREQ
        fbi->freq_transition.notifier_call = sa1100fb_freq_transition;
@@ -1504,7 +1507,9 @@ static int __init sa1100fb_probe(struct platform_device *pdev)
        /* This driver cannot be unloaded at the moment */
        return 0;
 
-failed:
+ err_free_irq:
+       free_irq(irq, fbi);
+ failed:
        platform_set_drvdata(pdev, NULL);
        kfree(fbi);
        release_mem_region(0xb0100000, 0x10000);