[ARM PATCH] 2454/1: cleanup shark_defconfig

Patch from Ben Dooks

remove a number of warnings from the default shark
build

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

diff --git a/arch/arm/common/via82c505.c b/arch/arm/common/via82c505.c
index b9d97239734bf64e21fad1cdaba2ce5f8534b66b..ef716a5b07ace7d6d640eede475c61eff24ea826 100644 (file)
--- a/arch/arm/common/via82c505.c
+++ b/arch/arm/common/via82c505.c
@@ -59,7 +59,7 @@ static struct pci_ops via82c505_ops = {
        .write  = via82c505_write_config,
 };
 
-void __init via82c505_preinit(void *sysdata)
+void __init via82c505_preinit(void)
 {
        printk(KERN_DEBUG "PCI: VIA 82c505\n");
        if (!request_region(0xA8,2,"via config")) {

diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index 81881e922716032be16dc002125361100206e1ef..a9bc5d0dbd85515c5694c04a3a21f8d0c706b35b 100644 (file)
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -93,8 +93,6 @@ static struct irqaction shark_timer_irq = {
  */
 static void __init shark_timer_init(void)
 {
-        unsigned long flags;
-
        outb(0x34, 0x43);               /* binary, mode 0, LSB/MSB, Ch 0 */
        outb(HZ_TIME & 0xff, 0x40);     /* LSB of count */
        outb(HZ_TIME >> 8, 0x40);

diff --git a/arch/arm/mach-shark/irq.c b/arch/arm/mach-shark/irq.c
index fb8e6b3c5838bf194a70455ad26f3eb2c3fbeffd..06b58131cb868a818419367a7033673b7db4d9f6 100644 (file)
--- a/arch/arm/mach-shark/irq.c
+++ b/arch/arm/mach-shark/irq.c
@@ -61,9 +61,10 @@ static void shark_enable_8259A_irq(unsigned int irq)
 
 static void shark_ack_8259A_irq(unsigned int irq){}
 
-static void bogus_int(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t bogus_int(int irq, void *dev_id, struct pt_regs *regs)
 {
        printk("Got interrupt %i!\n",irq);
+       return IRQ_NONE;
 }
 
 static struct irqaction cascade;
@@ -103,7 +104,6 @@ void __init shark_init_irq(void)
 
        cascade.handler = bogus_int;
        cascade.flags = 0;
-       cascade.mask = 0;
        cascade.name = "cascade";
        cascade.next = NULL;
        cascade.dev_id = NULL;

diff --git a/arch/arm/mach-shark/pci.c b/arch/arm/mach-shark/pci.c
index 05e992d354e2961e26329d37923412dc79cd7d1f..37a7112d4117ee1e0e75b9ae6e58ea72d82c8baf 100644 (file)
--- a/arch/arm/mach-shark/pci.c
+++ b/arch/arm/mach-shark/pci.c
@@ -21,7 +21,7 @@ static int __init shark_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
        else return 255;
 }
 
-extern void __init via82c505_preinit(void *sysdata);
+extern void __init via82c505_preinit(void);
 
 static struct hw_pci shark_pci __initdata = {
        .setup          = via82c505_setup,
@@ -29,7 +29,7 @@ static struct hw_pci shark_pci __initdata = {
        .map_irq        = shark_map_irq,
        .nr_controllers = 1,
        .scan           = via82c505_scan_bus,
-       .preinit        = via82c505_preinit
+       .preinit        = via82c505_preinit,
 };
 
 static int __init shark_pci_init(void)