[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>
This commit is contained in:
parent
63dcf0ad2a
commit
e9368f8288
|
@ -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)
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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";
|
||||
|
||||
|
|
|
@ -50,7 +50,6 @@
|
|||
#include <asm/system.h>
|
||||
#include <asm/ecard.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
#include "../8390.h"
|
||||
|
||||
|
|
|
@ -146,7 +146,6 @@
|
|||
|
||||
#include <asm/system.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/ecard.h>
|
||||
|
||||
#include "../scsi.h"
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
|
||||
#include <asm/dma.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/ecard.h>
|
||||
|
||||
#include "../scsi.h"
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
|
||||
#include <asm/ecard.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
#include "../scsi.h"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -178,7 +178,6 @@
|
|||
|
||||
#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);
|
||||
|
|
Loading…
Reference in New Issue