Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6] / arch / ppc / platforms / radstone_ppc7d.c

diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c
index 3bb530af029774b865849e24d5fee27c8fe83a11..f1dee1e878096b2a80f80c36cfe64fcf91a0606b 100644 (file)
--- a/arch/ppc/platforms/radstone_ppc7d.c
+++ b/arch/ppc/platforms/radstone_ppc7d.c
@@ -29,12 +29,12 @@
 #include <linux/initrd.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/ide.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/serial.h>
 #include <linux/tty.h>         /* for linux/serial_core.h */
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <linux/mv643xx.h>
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
@@ -451,11 +451,11 @@ static void __init ppc7d_calibrate_decr(void)
  * Interrupt stuff
  *****************************************************************************/
 
-static irqreturn_t ppc7d_i8259_intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t ppc7d_i8259_intr(int irq, void *dev_id)
 {
        u32 temp = mv64x60_read(&bh, MV64x60_GPP_INTR_CAUSE);
        if (temp & (1 << 28)) {
-               i8259_irq(regs);
+               i8259_irq();
                mv64x60_write(&bh, MV64x60_GPP_INTR_CAUSE, temp & (~(1 << 28)));
                return IRQ_HANDLED;
        }
@@ -511,7 +511,7 @@ static void __init ppc7d_init_irq(void)
 {
        int irq;
 
-       pr_debug("%s\n", __FUNCTION__);
+       pr_debug("%s\n", __func__);
        i8259_init(0, 0);
        mv64360_init_irq();
 
@@ -536,13 +536,13 @@ static u32 ppc7d_irq_canonicalize(u32 irq)
        return irq;
 }
 
-static int ppc7d_get_irq(struct pt_regs *regs)
+static int ppc7d_get_irq(void)
 {
        int irq;
 
-       irq = mv64360_get_irq(regs);
+       irq = mv64360_get_irq();
        if (irq == (mv64360_irq_base + MV64x60_IRQ_GPP28))
-               irq = i8259_irq(regs);
+               irq = i8259_irq();
        return irq;
 }
 
@@ -568,7 +568,7 @@ static int __init ppc7d_map_irq(struct pci_dev *dev, unsigned char idsel,
        };
        const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4;
 
-       pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __FUNCTION__,
+       pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __func__,
                 dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin);
 
        return PCI_IRQ_TABLE_LOOKUP;
@@ -1299,7 +1299,7 @@ static void ppc7d_init2(void)
        u32 data;
        u8 data8;
 
-       pr_debug("%s: enter\n", __FUNCTION__);
+       pr_debug("%s: enter\n", __func__);
 
        /* Wait for debugger? */
        if (ppc7d_wait_debugger) {
@@ -1332,7 +1332,7 @@ static void ppc7d_init2(void)
         ppc_md.set_rtc_time = ppc7d_set_rtc_time;
         ppc_md.get_rtc_time = ppc7d_get_rtc_time;
 
-       pr_debug("%s: exit\n", __FUNCTION__);
+       pr_debug("%s: exit\n", __func__);
 }
 
 /* Called from machine_init(), early, before any of the __init functions
@@ -1371,7 +1371,7 @@ void __init platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
         * are non-zero, then we should use the board info from the bd_t
         * structure and the cmdline pointed to by r6 instead of the
         * information from birecs, if any.  Otherwise, use the information
-        * from birecs as discovered by the preceeding call to
+        * from birecs as discovered by the preceding call to
         * parse_bootinfo().  This rule should work with both PPCBoot, which
         * uses a bd_t board info structure, and the kernel boot wrapper,
         * which uses birecs.