1 files changed, 45 insertions, 67 deletions

diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index d7b9b9c69287..7367d17364cb 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -18,7 +18,7 @@
 #include <linux/stddef.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/device.h>
 #include <linux/bootmem.h>
 #include <linux/spinlock.h>
@@ -521,12 +521,10 @@ static inline struct ipic * ipic_from_irq(unsigned int virq)
         return primary_ipic;
 }
 
-#define ipic_irq_to_hw(virq)    ((unsigned int)irq_map[virq].hwirq)
-
-static void ipic_unmask_irq(unsigned int virq)
+static void ipic_unmask_irq(struct irq_data *d)
 {
-        struct ipic *ipic = ipic_from_irq(virq);
-        unsigned int src = ipic_irq_to_hw(virq);
+        struct ipic *ipic = ipic_from_irq(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 temp;
 
@@ -539,10 +537,10 @@ static void ipic_unmask_irq(unsigned int virq)
         raw_spin_unlock_irqrestore(&ipic_lock, flags);
 }
 
-static void ipic_mask_irq(unsigned int virq)
+static void ipic_mask_irq(struct irq_data *d)
 {
-        struct ipic *ipic = ipic_from_irq(virq);
-        unsigned int src = ipic_irq_to_hw(virq);
+        struct ipic *ipic = ipic_from_irq(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 temp;
 
@@ -559,10 +557,10 @@ static void ipic_mask_irq(unsigned int virq)
         raw_spin_unlock_irqrestore(&ipic_lock, flags);
 }
 
-static void ipic_ack_irq(unsigned int virq)
+static void ipic_ack_irq(struct irq_data *d)
 {
-        struct ipic *ipic = ipic_from_irq(virq);
-        unsigned int src = ipic_irq_to_hw(virq);
+        struct ipic *ipic = ipic_from_irq(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 temp;
 
@@ -578,10 +576,10 @@ static void ipic_ack_irq(unsigned int virq)
         raw_spin_unlock_irqrestore(&ipic_lock, flags);
 }
 
-static void ipic_mask_irq_and_ack(unsigned int virq)
+static void ipic_mask_irq_and_ack(struct irq_data *d)
 {
-        struct ipic *ipic = ipic_from_irq(virq);
-        unsigned int src = ipic_irq_to_hw(virq);
+        struct ipic *ipic = ipic_from_irq(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 temp;
 
@@ -601,11 +599,10 @@ static void ipic_mask_irq_and_ack(unsigned int virq)
         raw_spin_unlock_irqrestore(&ipic_lock, flags);
 }
 
-static int ipic_set_irq_type(unsigned int virq, unsigned int flow_type)
+static int ipic_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
-        struct ipic *ipic = ipic_from_irq(virq);
-        unsigned int src = ipic_irq_to_hw(virq);
-        struct irq_desc *desc = irq_to_desc(virq);
+        struct ipic *ipic = ipic_from_irq(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned int vold, vnew, edibit;
 
         if (flow_type == IRQ_TYPE_NONE)
@@ -623,17 +620,16 @@ static int ipic_set_irq_type(unsigned int virq, unsigned int flow_type)
                 printk(KERN_ERR "ipic: edge sense not supported on internal "
                                 "interrupts\n");
                 return -EINVAL;
+
         }
 
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
+        irqd_set_trigger_type(d, flow_type);
         if (flow_type & IRQ_TYPE_LEVEL_LOW)  {
-                desc->status |= IRQ_LEVEL;
-                desc->handle_irq = handle_level_irq;
-                desc->chip = &ipic_level_irq_chip;
+                __irq_set_handler_locked(d->irq, handle_level_irq);
+                d->chip = &ipic_level_irq_chip;
         } else {
-                desc->handle_irq = handle_edge_irq;
-                desc->chip = &ipic_edge_irq_chip;
+                __irq_set_handler_locked(d->irq, handle_edge_irq);
+                d->chip = &ipic_edge_irq_chip;
         }
 
         /* only EXT IRQ senses are programmable on ipic
@@ -655,25 +651,25 @@ static int ipic_set_irq_type(unsigned int virq, unsigned int flow_type)
         }
         if (vold != vnew)
                 ipic_write(ipic->regs, IPIC_SECNR, vnew);
-        return 0;
+        return IRQ_SET_MASK_OK_NOCOPY;
 }
 
 /* level interrupts and edge interrupts have different ack operations */
 static struct irq_chip ipic_level_irq_chip = {
         .name           = "IPIC",
-        .unmask         = ipic_unmask_irq,
-        .mask           = ipic_mask_irq,
-        .mask_ack       = ipic_mask_irq,
-        .set_type       = ipic_set_irq_type,
+        .irq_unmask     = ipic_unmask_irq,
+        .irq_mask       = ipic_mask_irq,
+        .irq_mask_ack   = ipic_mask_irq,
+        .irq_set_type   = ipic_set_irq_type,
 };
 
 static struct irq_chip ipic_edge_irq_chip = {
         .name           = "IPIC",
-        .unmask         = ipic_unmask_irq,
-        .mask           = ipic_mask_irq,
-        .mask_ack       = ipic_mask_irq_and_ack,
-        .ack            = ipic_ack_irq,
-        .set_type       = ipic_set_irq_type,
+        .irq_unmask     = ipic_unmask_irq,
+        .irq_mask       = ipic_mask_irq,
+        .irq_mask_ack   = ipic_mask_irq_and_ack,
+        .irq_ack        = ipic_ack_irq,
+        .irq_set_type   = ipic_set_irq_type,
 };
 
 static int ipic_host_match(struct irq_host *h, struct device_node *node)
@@ -687,11 +683,11 @@ static int ipic_host_map(struct irq_host *h, unsigned int virq,
 {
         struct ipic *ipic = h->host_data;
 
-        set_irq_chip_data(virq, ipic);
-        set_irq_chip_and_handler(virq, &ipic_level_irq_chip, handle_level_irq);
+        irq_set_chip_data(virq, ipic);
+        irq_set_chip_and_handler(virq, &ipic_level_irq_chip, handle_level_irq);
 
         /* Set default irq type */
-        set_irq_type(virq, IRQ_TYPE_NONE);
+        irq_set_irq_type(virq, IRQ_TYPE_NONE);
 
         return 0;
 }
@@ -795,7 +791,7 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
 int ipic_set_priority(unsigned int virq, unsigned int priority)
 {
         struct ipic *ipic = ipic_from_irq(virq);
-        unsigned int src = ipic_irq_to_hw(virq);
+        unsigned int src = virq_to_hw(virq);
         u32 temp;
 
         if (priority > 7)
@@ -823,7 +819,7 @@ int ipic_set_priority(unsigned int virq, unsigned int priority)
 void ipic_set_highest_priority(unsigned int virq)
 {
         struct ipic *ipic = ipic_from_irq(virq);
-        unsigned int src = ipic_irq_to_hw(virq);
+        unsigned int src = virq_to_hw(virq);
         u32 temp;
 
         temp = ipic_read(ipic->regs, IPIC_SICFR);
@@ -904,7 +900,7 @@ static struct {
         u32 sercr;
 } ipic_saved_state;
 
-static int ipic_suspend(struct sys_device *sdev, pm_message_t state)
+static int ipic_suspend(void)
 {
         struct ipic *ipic = primary_ipic;
 
@@ -935,7 +931,7 @@ static int ipic_suspend(struct sys_device *sdev, pm_message_t state)
         return 0;
 }
 
-static int ipic_resume(struct sys_device *sdev)
+static void ipic_resume(void)
 {
         struct ipic *ipic = primary_ipic;
 
@@ -951,44 +947,26 @@ static int ipic_resume(struct sys_device *sdev)
         ipic_write(ipic->regs, IPIC_SECNR, ipic_saved_state.secnr);
         ipic_write(ipic->regs, IPIC_SERMR, ipic_saved_state.sermr);
         ipic_write(ipic->regs, IPIC_SERCR, ipic_saved_state.sercr);
-
-        return 0;
 }
 #else
 #define ipic_suspend NULL
 #define ipic_resume NULL
 #endif
 
-static struct sysdev_class ipic_sysclass = {
-        .name = "ipic",
+static struct syscore_ops ipic_syscore_ops = {
         .suspend = ipic_suspend,
         .resume = ipic_resume,
 };
 
-static struct sys_device device_ipic = {
-        .id             = 0,
-        .cls            = &ipic_sysclass,
-};
-
-static int __init init_ipic_sysfs(void)
+static int __init init_ipic_syscore(void)
 {
-        int rc;
-
         if (!primary_ipic || !primary_ipic->regs)
                 return -ENODEV;
-        printk(KERN_DEBUG "Registering ipic with sysfs...\n");
 
-        rc = sysdev_class_register(&ipic_sysclass);
-        if (rc) {
-                printk(KERN_ERR "Failed registering ipic sys class\n");
-                return -ENODEV;
-        }
-        rc = sysdev_register(&device_ipic);
-        if (rc) {
-                printk(KERN_ERR "Failed registering ipic sys device\n");
-                return -ENODEV;
-        }
+        printk(KERN_DEBUG "Registering ipic system core operations\n");
+        register_syscore_ops(&ipic_syscore_ops);
+
         return 0;
 }
 
-subsys_initcall(init_ipic_sysfs);
+subsys_initcall(init_ipic_syscore);