[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

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")) {

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);

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;

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)