[PATCH] ppc64: Rename ItLpQueue_* functions to hvlpevent_queue_*

Now that we've renamed the xItLpQueue structure, rename the functions that
operate on it also.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/ppc64/kernel/ItLpQueue.c b/arch/ppc64/kernel/ItLpQueue.c
index e55fe1a2725f642aefae34e116231d2447a998f5..a81e49b91af0cbc0459854de4c77a49d7447aff1 100644 (file)
--- a/arch/ppc64/kernel/ItLpQueue.c
+++ b/arch/ppc64/kernel/ItLpQueue.c
@@ -70,7 +70,7 @@ static __inline__ void clear_inUse(void)
 extern LpEventHandler lpEventHandler[HvLpEvent_Type_NumTypes];
 unsigned long ItLpQueueInProcess = 0;
 
-static struct HvLpEvent * ItLpQueue_getNextLpEvent(void)
+static struct HvLpEvent * get_next_hvlpevent(void)
 {
        struct HvLpEvent * nextLpEvent = 
                (struct HvLpEvent *)hvlpevent_queue.xSlicCurEventPtr;
@@ -94,7 +94,7 @@ static struct HvLpEvent * ItLpQueue_getNextLpEvent(void)
 
 static unsigned long spread_lpevents = NR_CPUS;
 
-int ItLpQueue_isLpIntPending(void)
+int hvlpevent_is_pending(void)
 {
        struct HvLpEvent *next_event;
 
@@ -105,7 +105,7 @@ int ItLpQueue_isLpIntPending(void)
        return next_event->xFlags.xValid | hvlpevent_queue.xPlicOverflowIntPending;
 }
 
-static void ItLpQueue_clearValid( struct HvLpEvent * event )
+static void hvlpevent_clear_valid( struct HvLpEvent * event )
 {
        /* Clear the valid bit of the event
         * Also clear bits within this event that might
@@ -127,7 +127,7 @@ static void ItLpQueue_clearValid( struct HvLpEvent * event )
        event->xFlags.xValid = 0;
 }
 
-unsigned ItLpQueue_process(struct pt_regs *regs)
+unsigned process_hvlpevents(struct pt_regs *regs)
 {
        unsigned numIntsProcessed = 0;
        struct HvLpEvent * nextLpEvent;
@@ -142,7 +142,7 @@ unsigned ItLpQueue_process(struct pt_regs *regs)
                BUG();
 
        for (;;) {
-               nextLpEvent = ItLpQueue_getNextLpEvent();
+               nextLpEvent = get_next_hvlpevent();
                if ( nextLpEvent ) {
                        /* Count events to return to caller
                         * and count processed events in hvlpevent_queue
@@ -170,7 +170,7 @@ unsigned ItLpQueue_process(struct pt_regs *regs)
                        else
                                printk(KERN_INFO "Unexpected Lp Event type=%d\n", nextLpEvent->xType );
                        
-                       ItLpQueue_clearValid( nextLpEvent );
+                       hvlpevent_clear_valid( nextLpEvent );
                } else if ( hvlpevent_queue.xPlicOverflowIntPending )
                        /*
                         * No more valid events. If overflow events are

diff --git a/arch/ppc64/kernel/idle.c b/arch/ppc64/kernel/idle.c
index a7ebd0238d39a989401cb68088f262e6796466e6..08952c7e621648e9d8593e395e14de143e674e22 100644 (file)
--- a/arch/ppc64/kernel/idle.c
+++ b/arch/ppc64/kernel/idle.c
@@ -88,7 +88,7 @@ static int iSeries_idle(void)
 
        while (1) {
                if (lpaca->lppaca.shared_proc) {
-                       if (ItLpQueue_isLpIntPending())
+                       if (hvlpevent_is_pending())
                                process_iSeries_events();
                        if (!need_resched())
                                yield_shared_processor();
@@ -100,7 +100,7 @@ static int iSeries_idle(void)
 
                                while (!need_resched()) {
                                        HMT_medium();
-                                       if (ItLpQueue_isLpIntPending())
+                                       if (hvlpevent_is_pending())
                                                process_iSeries_events();
                                        HMT_low();
                                }

diff --git a/arch/ppc64/kernel/irq.c b/arch/ppc64/kernel/irq.c
index 46a7151ad6d5d31860553fceb1212bda955b1b00..bd4b035af6222d4b64eb02fa24458a00f58ec668 100644 (file)
--- a/arch/ppc64/kernel/irq.c
+++ b/arch/ppc64/kernel/irq.c
@@ -294,8 +294,8 @@ void do_IRQ(struct pt_regs *regs)
                iSeries_smp_message_recv(regs);
        }
 #endif /* CONFIG_SMP */
-       if (ItLpQueue_isLpIntPending())
-               lpevent_count += ItLpQueue_process(regs);
+       if (hvlpevent_is_pending())
+               lpevent_count += process_hvlpevents(regs);
 
        irq_exit();
 

diff --git a/arch/ppc64/kernel/mf.c b/arch/ppc64/kernel/mf.c
index ef9206998028cd98d151e2cfcc57bcbb19dcff19..609bf1bda7b81cfe8ee962d282c7c27ea6407cd5 100644 (file)
--- a/arch/ppc64/kernel/mf.c
+++ b/arch/ppc64/kernel/mf.c
@@ -802,8 +802,8 @@ int mf_get_boot_rtc(struct rtc_time *tm)
        /* We need to poll here as we are not yet taking interrupts */
        while (rtc_data.busy) {
                extern unsigned long lpevent_count;
-               if (ItLpQueue_isLpIntPending())
-                       lpevent_count += ItLpQueue_process(NULL);
+               if (hvlpevent_is_pending())
+                       lpevent_count += process_hvlpevents(NULL);
        }
        return rtc_set_tm(rtc_data.rc, rtc_data.ce_msg.ce_msg, tm);
 }

diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c
index c133f9c28c57aba2c953a76754222e96185bfac3..f9c18400ebf582f43fb644865c97a10a12d348a7 100644 (file)
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
@@ -367,8 +367,8 @@ int timer_interrupt(struct pt_regs * regs)
        set_dec(next_dec);
 
 #ifdef CONFIG_PPC_ISERIES
-       if (ItLpQueue_isLpIntPending())
-               lpevent_count += ItLpQueue_process(regs);
+       if (hvlpevent_is_pending())
+               lpevent_count += process_hvlpevents(regs);
 #endif
 
 /* collect purr register values often, for accurate calculations */

diff --git a/include/asm-ppc64/iSeries/ItLpQueue.h b/include/asm-ppc64/iSeries/ItLpQueue.h
index bebfb364f556ce0f099f18723e7780abe24cfffd..f0f24a39ff6db656984a302ee9b9e5525d7ed822 100644 (file)
--- a/include/asm-ppc64/iSeries/ItLpQueue.h
+++ b/include/asm-ppc64/iSeries/ItLpQueue.h
@@ -76,8 +76,8 @@ struct hvlpevent_queue {
 
 extern struct hvlpevent_queue hvlpevent_queue;
 
-extern int ItLpQueue_isLpIntPending(void);
-extern unsigned ItLpQueue_process(struct pt_regs *);
+extern int hvlpevent_is_pending(void);
+extern unsigned process_hvlpevents(struct pt_regs *);
 extern void setup_hvlpevent_queue(void);
 
 #endif /* _ITLPQUEUE_H */