dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

powerpc: Convert to new irq_* function names 

Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2011-03-25 16:45:20 +01:00
parent 7bfbc1f283
commit ec775d0e70
53 changed files with 188 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/kernel/irq.c
View File

@ -830,7 +830,7 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
/* Set type if specified and different than the current one */ /* Set type if specified and different than the current one */
if (type != IRQ_TYPE_NONE && if (type != IRQ_TYPE_NONE &&
type != (irqd_get_trigger_type(irq_get_irq_data(virq)))) type != (irqd_get_trigger_type(irq_get_irq_data(virq))))
set_irq_type(virq, type); irq_set_irq_type(virq, type);
return virq; return virq;
} }
EXPORT_SYMBOL_GPL(irq_create_of_mapping); EXPORT_SYMBOL_GPL(irq_create_of_mapping);
@ -853,7 +853,7 @@ void irq_dispose_mapping(unsigned int virq)
return; return;
/* remove chip and handler */ /* remove chip and handler */
set_irq_chip_and_handler(virq, NULL, NULL); irq_set_chip_and_handler(virq, NULL, NULL);
/* Make sure it's completed */ /* Make sure it's completed */
synchronize_irq(virq); synchronize_irq(virq);
@ -1158,7 +1158,7 @@ static int virq_debug_show(struct seq_file *m, void *private)
seq_printf(m, "%5d ", i); seq_printf(m, "%5d ", i);
seq_printf(m, "0x%05lx ", virq_to_hw(i)); seq_printf(m, "0x%05lx ", virq_to_hw(i));
chip = get_irq_desc_chip(desc); chip = irq_desc_get_chip(desc);
if (chip && chip->name) if (chip && chip->name)
p = chip->name; p = chip->name;
else else

2
arch/powerpc/kernel/machine_kexec.c
View File

@ -31,7 +31,7 @@ void machine_kexec_mask_interrupts(void) {
if (!desc) if (!desc)
continue; continue;
chip = get_irq_desc_chip(desc); chip = irq_desc_get_chip(desc);
if (!chip) if (!chip)
continue; continue;

2
arch/powerpc/kernel/pci-common.c
View File

@ -261,7 +261,7 @@ int pci_read_irq_line(struct pci_dev *pci_dev)
virq = irq_create_mapping(NULL, line); virq = irq_create_mapping(NULL, line);
if (virq != NO_IRQ) if (virq != NO_IRQ)
set_irq_type(virq, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
} else { } else {
pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n", pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",
oirq.size, oirq.specifier[0], oirq.specifier[1], oirq.size, oirq.specifier[0], oirq.specifier[1],

4
arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
View File

@ -133,7 +133,7 @@ cpld_pic_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw) irq_hw_number_t hw)
{ {
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_and_handler(virq, &cpld_pic, handle_level_irq); irq_set_chip_and_handler(virq, &cpld_pic, handle_level_irq);
return 0; return 0;
} }
@ -198,7 +198,7 @@ mpc5121_ads_cpld_pic_init(void)
goto end; goto end;
} }
set_irq_chained_handler(cascade_irq, cpld_pic_cascade); irq_set_chained_handler(cascade_irq, cpld_pic_cascade);
end: end:
of_node_put(np); of_node_put(np);
} }

10
arch/powerpc/platforms/52xx/media5200.c
View File

@ -82,7 +82,7 @@ static struct irq_chip media5200_irq_chip = {
void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc) void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
int sub_virq, val; int sub_virq, val;
u32 status, enable; u32 status, enable;
@ -116,8 +116,8 @@ static int media5200_irq_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw) irq_hw_number_t hw)
{ {
pr_debug("%s: h=%p, virq=%i, hwirq=%i\n", __func__, h, virq, (int)hw); pr_debug("%s: h=%p, virq=%i, hwirq=%i\n", __func__, h, virq, (int)hw);
set_irq_chip_data(virq, &media5200_irq); irq_set_chip_data(virq, &media5200_irq);
set_irq_chip_and_handler(virq, &media5200_irq_chip, handle_level_irq); irq_set_chip_and_handler(virq, &media5200_irq_chip, handle_level_irq);
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
return 0; return 0;
} }
@ -182,8 +182,8 @@ static void __init media5200_init_irq(void)
media5200_irq.irqhost->host_data = &media5200_irq; media5200_irq.irqhost->host_data = &media5200_irq;
set_irq_data(cascade_virq, &media5200_irq); irq_set_handler_data(cascade_virq, &media5200_irq);
set_irq_chained_handler(cascade_virq, media5200_irq_cascade); irq_set_chained_handler(cascade_virq, media5200_irq_cascade);
return; return;

10
arch/powerpc/platforms/52xx/mpc52xx_gpt.c
View File

@ -192,7 +192,7 @@ static struct irq_chip mpc52xx_gpt_irq_chip = {
void mpc52xx_gpt_irq_cascade(unsigned int virq, struct irq_desc *desc) void mpc52xx_gpt_irq_cascade(unsigned int virq, struct irq_desc *desc)
{ {
struct mpc52xx_gpt_priv *gpt = get_irq_data(virq); struct mpc52xx_gpt_priv *gpt = irq_get_handler_data(virq);
int sub_virq; int sub_virq;
u32 status; u32 status;
@ -209,8 +209,8 @@ static int mpc52xx_gpt_irq_map(struct irq_host *h, unsigned int virq,
struct mpc52xx_gpt_priv *gpt = h->host_data; struct mpc52xx_gpt_priv *gpt = h->host_data;
dev_dbg(gpt->dev, "%s: h=%p, virq=%i\n", __func__, h, virq); dev_dbg(gpt->dev, "%s: h=%p, virq=%i\n", __func__, h, virq);
set_irq_chip_data(virq, gpt); irq_set_chip_data(virq, gpt);
set_irq_chip_and_handler(virq, &mpc52xx_gpt_irq_chip, handle_edge_irq); irq_set_chip_and_handler(virq, &mpc52xx_gpt_irq_chip, handle_edge_irq);
return 0; return 0;
} }
@ -259,8 +259,8 @@ mpc52xx_gpt_irq_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)
} }
gpt->irqhost->host_data = gpt; gpt->irqhost->host_data = gpt;
set_irq_data(cascade_virq, gpt); irq_set_handler_data(cascade_virq, gpt);
set_irq_chained_handler(cascade_virq, mpc52xx_gpt_irq_cascade); irq_set_chained_handler(cascade_virq, mpc52xx_gpt_irq_cascade);
/* If the GPT is currently disabled, then change it to be in Input /* If the GPT is currently disabled, then change it to be in Input
* Capture mode. If the mode is non-zero, then the pin could be * Capture mode. If the mode is non-zero, then the pin could be

6
arch/powerpc/platforms/52xx/mpc52xx_pic.c
View File

@ -214,7 +214,7 @@ static int mpc52xx_extirq_set_type(struct irq_data *d, unsigned int flow_type)
ctrl_reg |= (type << (22 - (l2irq * 2))); ctrl_reg |= (type << (22 - (l2irq * 2)));
out_be32(&intr->ctrl, ctrl_reg); out_be32(&intr->ctrl, ctrl_reg);
__set_irq_handler_unlocked(d->irq, handler); __irq_set_handler_locked(d->irq, handler);
return 0; return 0;
} }
@ -414,7 +414,7 @@ static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
else else
hndlr = handle_level_irq; hndlr = handle_level_irq;
set_irq_chip_and_handler(virq, &mpc52xx_extirq_irqchip, hndlr); irq_set_chip_and_handler(virq, &mpc52xx_extirq_irqchip, hndlr);
pr_debug("%s: External IRQ%i virq=%x, hw=%x. type=%x\n", pr_debug("%s: External IRQ%i virq=%x, hw=%x. type=%x\n",
__func__, l2irq, virq, (int)irq, type); __func__, l2irq, virq, (int)irq, type);
return 0; return 0;
@ -431,7 +431,7 @@ static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
return -EINVAL; return -EINVAL;
} }
set_irq_chip_and_handler(virq, irqchip, handle_level_irq); irq_set_chip_and_handler(virq, irqchip, handle_level_irq);
pr_debug("%s: virq=%x, l1=%i, l2=%i\n", __func__, virq, l1irq, l2irq); pr_debug("%s: virq=%x, l1=%i, l2=%i\n", __func__, virq, l1irq, l2irq);
return 0; return 0;

14
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
View File

@ -81,7 +81,7 @@ static struct irq_chip pq2ads_pci_ic = {
static void pq2ads_pci_irq_demux(unsigned int irq, struct irq_desc *desc) static void pq2ads_pci_irq_demux(unsigned int irq, struct irq_desc *desc)
{ {
struct pq2ads_pci_pic *priv = get_irq_desc_data(desc); struct pq2ads_pci_pic *priv = irq_desc_get_handler_data(desc);
u32 stat, mask, pend; u32 stat, mask, pend;
int bit; int bit;
@ -107,16 +107,16 @@ static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw) irq_hw_number_t hw)
{ {
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_data(virq, h->host_data); irq_set_chip_data(virq, h->host_data);
set_irq_chip_and_handler(virq, &pq2ads_pci_ic, handle_level_irq); irq_set_chip_and_handler(virq, &pq2ads_pci_ic, handle_level_irq);
return 0; return 0;
} }
static void pci_host_unmap(struct irq_host *h, unsigned int virq) static void pci_host_unmap(struct irq_host *h, unsigned int virq)
{ {
/* remove chip and handler */ /* remove chip and handler */
set_irq_chip_data(virq, NULL); irq_set_chip_data(virq, NULL);
set_irq_chip(virq, NULL); irq_set_chip(virq, NULL);
} }
static struct irq_host_ops pci_pic_host_ops = { static struct irq_host_ops pci_pic_host_ops = {
@ -175,8 +175,8 @@ int __init pq2ads_pci_init_irq(void)
priv->host = host; priv->host = host;
host->host_data = priv; host->host_data = priv;
set_irq_data(irq, priv); irq_set_handler_data(irq, priv);
set_irq_chained_handler(irq, pq2ads_pci_irq_demux); irq_set_chained_handler(irq, pq2ads_pci_irq_demux);
of_node_put(np); of_node_put(np);
return 0; return 0;

4
arch/powerpc/platforms/85xx/ksi8560.c
View File

@ -56,7 +56,7 @@ static void machine_restart(char *cmd)
static void cpm2_cascade(unsigned int irq, struct irq_desc *desc) static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
int cascade_irq; int cascade_irq;
while ((cascade_irq = cpm2_get_irq()) >= 0) while ((cascade_irq = cpm2_get_irq()) >= 0)
@ -106,7 +106,7 @@ static void __init ksi8560_pic_init(void)
cpm2_pic_init(np); cpm2_pic_init(np);
of_node_put(np); of_node_put(np);
set_irq_chained_handler(irq, cpm2_cascade); irq_set_chained_handler(irq, cpm2_cascade);
#endif #endif
} }

4
arch/powerpc/platforms/85xx/mpc85xx_ads.c
View File

@ -50,7 +50,7 @@ static int mpc85xx_exclude_device(struct pci_controller *hose,
static void cpm2_cascade(unsigned int irq, struct irq_desc *desc) static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
int cascade_irq; int cascade_irq;
while ((cascade_irq = cpm2_get_irq()) >= 0) while ((cascade_irq = cpm2_get_irq()) >= 0)
@ -101,7 +101,7 @@ static void __init mpc85xx_ads_pic_init(void)
cpm2_pic_init(np); cpm2_pic_init(np);
of_node_put(np); of_node_put(np);
set_irq_chained_handler(irq, cpm2_cascade); irq_set_chained_handler(irq, cpm2_cascade);
#endif #endif
} }

2
arch/powerpc/platforms/85xx/mpc85xx_cds.c
View File

@ -255,7 +255,7 @@ static int mpc85xx_cds_8259_attach(void)
} }
/* Success. Connect our low-level cascade handler. */ /* Success. Connect our low-level cascade handler. */
set_irq_handler(cascade_irq, mpc85xx_8259_cascade_handler); irq_set_handler(cascade_irq, mpc85xx_8259_cascade_handler);
return 0; return 0;
} }

4
arch/powerpc/platforms/85xx/mpc85xx_ds.c
View File

@ -47,7 +47,7 @@
#ifdef CONFIG_PPC_I8259 #ifdef CONFIG_PPC_I8259
static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc) static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int cascade_irq = i8259_irq(); unsigned int cascade_irq = i8259_irq();
if (cascade_irq != NO_IRQ) { if (cascade_irq != NO_IRQ) {
@ -122,7 +122,7 @@ void __init mpc85xx_ds_pic_init(void)
i8259_init(cascade_node, 0); i8259_init(cascade_node, 0);
of_node_put(cascade_node); of_node_put(cascade_node);
set_irq_chained_handler(cascade_irq, mpc85xx_8259_cascade); irq_set_chained_handler(cascade_irq, mpc85xx_8259_cascade);
#endif /* CONFIG_PPC_I8259 */ #endif /* CONFIG_PPC_I8259 */
} }

4
arch/powerpc/platforms/85xx/sbc8560.c
View File

@ -41,7 +41,7 @@
static void cpm2_cascade(unsigned int irq, struct irq_desc *desc) static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
int cascade_irq; int cascade_irq;
while ((cascade_irq = cpm2_get_irq()) >= 0) while ((cascade_irq = cpm2_get_irq()) >= 0)
@ -92,7 +92,7 @@ static void __init sbc8560_pic_init(void)
cpm2_pic_init(np); cpm2_pic_init(np);
of_node_put(np); of_node_put(np);
set_irq_chained_handler(irq, cpm2_cascade); irq_set_chained_handler(irq, cpm2_cascade);
#endif #endif
} }

10
arch/powerpc/platforms/85xx/socrates_fpga_pic.c
View File

@ -93,7 +93,7 @@ static inline unsigned int socrates_fpga_pic_get_irq(unsigned int irq)
void socrates_fpga_pic_cascade(unsigned int irq, struct irq_desc *desc) void socrates_fpga_pic_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int cascade_irq; unsigned int cascade_irq;
/* /*
@ -246,8 +246,8 @@ static int socrates_fpga_pic_host_map(struct irq_host *h, unsigned int virq,
{ {
/* All interrupts are LEVEL sensitive */ /* All interrupts are LEVEL sensitive */
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_and_handler(virq, &socrates_fpga_pic_chip, irq_set_chip_and_handler(virq, &socrates_fpga_pic_chip,
handle_fasteoi_irq); handle_fasteoi_irq);
return 0; return 0;
} }
@ -308,8 +308,8 @@ void socrates_fpga_pic_init(struct device_node *pic)
pr_warning("FPGA PIC: can't get irq%d.\n", i); pr_warning("FPGA PIC: can't get irq%d.\n", i);
continue; continue;
} }
set_irq_chained_handler(socrates_fpga_irqs[i], irq_set_chained_handler(socrates_fpga_irqs[i],
socrates_fpga_pic_cascade); socrates_fpga_pic_cascade);
} }
socrates_fpga_pic_iobase = of_iomap(pic, 0); socrates_fpga_pic_iobase = of_iomap(pic, 0);

4
arch/powerpc/platforms/85xx/stx_gp3.c
View File

@ -46,7 +46,7 @@
static void cpm2_cascade(unsigned int irq, struct irq_desc *desc) static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
int cascade_irq; int cascade_irq;
while ((cascade_irq = cpm2_get_irq()) >= 0) while ((cascade_irq = cpm2_get_irq()) >= 0)
@ -102,7 +102,7 @@ static void __init stx_gp3_pic_init(void)
cpm2_pic_init(np); cpm2_pic_init(np);
of_node_put(np); of_node_put(np);
set_irq_chained_handler(irq, cpm2_cascade); irq_set_chained_handler(irq, cpm2_cascade);
#endif #endif
} }

4
arch/powerpc/platforms/85xx/tqm85xx.c
View File

@ -44,7 +44,7 @@
static void cpm2_cascade(unsigned int irq, struct irq_desc *desc) static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
int cascade_irq; int cascade_irq;
while ((cascade_irq = cpm2_get_irq()) >= 0) while ((cascade_irq = cpm2_get_irq()) >= 0)
@ -100,7 +100,7 @@ static void __init tqm85xx_pic_init(void)
cpm2_pic_init(np); cpm2_pic_init(np);
of_node_put(np); of_node_put(np);
set_irq_chained_handler(irq, cpm2_cascade); irq_set_chained_handler(irq, cpm2_cascade);
#endif #endif
} }

6
arch/powerpc/platforms/86xx/gef_pic.c
View File

@ -95,7 +95,7 @@ static int gef_pic_cascade_irq;
void gef_pic_cascade(unsigned int irq, struct irq_desc *desc) void gef_pic_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int cascade_irq; unsigned int cascade_irq;
/* /*
@ -164,7 +164,7 @@ static int gef_pic_host_map(struct irq_host *h, unsigned int virq,
{ {
/* All interrupts are LEVEL sensitive */ /* All interrupts are LEVEL sensitive */
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_and_handler(virq, &gef_pic_chip, handle_level_irq); irq_set_chip_and_handler(virq, &gef_pic_chip, handle_level_irq);
return 0; return 0;
} }
@ -225,7 +225,7 @@ void __init gef_pic_init(struct device_node *np)
return; return;
/* Chain with parent controller */ /* Chain with parent controller */
set_irq_chained_handler(gef_pic_cascade_irq, gef_pic_cascade); irq_set_chained_handler(gef_pic_cascade_irq, gef_pic_cascade);
} }
/* /*

4
arch/powerpc/platforms/86xx/pic.c
View File

@ -19,7 +19,7 @@
#ifdef CONFIG_PPC_I8259 #ifdef CONFIG_PPC_I8259
static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc) static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int cascade_irq = i8259_irq(); unsigned int cascade_irq = i8259_irq();
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
@ -77,6 +77,6 @@ void __init mpc86xx_init_irq(void)
i8259_init(cascade_node, 0); i8259_init(cascade_node, 0);
of_node_put(cascade_node); of_node_put(cascade_node);
set_irq_chained_handler(cascade_irq, mpc86xx_8259_cascade); irq_set_chained_handler(cascade_irq, mpc86xx_8259_cascade);
#endif #endif
} }

6
arch/powerpc/platforms/8xx/m8xx_setup.c
View File

@ -226,11 +226,11 @@ static void cpm_cascade(unsigned int irq, struct irq_desc *desc)
generic_handle_irq(cascade_irq); generic_handle_irq(cascade_irq);
chip = get_irq_desc_chip(cdesc); chip = irq_desc_get_chip(cdesc);
chip->irq_eoi(&cdesc->irq_data); chip->irq_eoi(&cdesc->irq_data);
} }
chip = get_irq_desc_chip(desc); chip = irq_desc_get_chip(desc);
chip->irq_eoi(&desc->irq_data); chip->irq_eoi(&desc->irq_data);
} }
@ -251,5 +251,5 @@ void __init mpc8xx_pics_init(void)
irq = cpm_pic_init(); irq = cpm_pic_init();
if (irq != NO_IRQ) if (irq != NO_IRQ)
set_irq_chained_handler(irq, cpm_cascade); irq_set_chained_handler(irq, cpm_cascade);
} }

14
arch/powerpc/platforms/cell/axon_msi.c
View File

@ -93,8 +93,8 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)
static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc) static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
struct axon_msic *msic = get_irq_data(irq); struct axon_msic *msic = irq_get_handler_data(irq);
u32 write_offset, msi; u32 write_offset, msi;
int idx; int idx;
int retry = 0; int retry = 0;
@ -287,7 +287,7 @@ static int axon_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
} }
dev_dbg(&dev->dev, "axon_msi: allocated virq 0x%x\n", virq); dev_dbg(&dev->dev, "axon_msi: allocated virq 0x%x\n", virq);
set_irq_msi(virq, entry); irq_set_msi_desc(virq, entry);
msg.data = virq; msg.data = virq;
write_msi_msg(virq, &msg); write_msi_msg(virq, &msg);
} }
@ -305,7 +305,7 @@ static void axon_msi_teardown_msi_irqs(struct pci_dev *dev)
if (entry->irq == NO_IRQ) if (entry->irq == NO_IRQ)
continue; continue;
set_irq_msi(entry->irq, NULL); irq_set_msi_desc(entry->irq, NULL);
irq_dispose_mapping(entry->irq); irq_dispose_mapping(entry->irq);
} }
} }
@ -320,7 +320,7 @@ static struct irq_chip msic_irq_chip = {
static int msic_host_map(struct irq_host *h, unsigned int virq, static int msic_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw) irq_hw_number_t hw)
{ {
set_irq_chip_and_handler(virq, &msic_irq_chip, handle_simple_irq); irq_set_chip_and_handler(virq, &msic_irq_chip, handle_simple_irq);
return 0; return 0;
} }
@ -400,8 +400,8 @@ static int axon_msi_probe(struct platform_device *device)
msic->irq_host->host_data = msic; msic->irq_host->host_data = msic;
set_irq_data(virq, msic); irq_set_handler_data(virq, msic);
set_irq_chained_handler(virq, axon_msi_cascade); irq_set_chained_handler(virq, axon_msi_cascade);
pr_devel("axon_msi: irq 0x%x setup for axon_msi\n", virq); pr_devel("axon_msi: irq 0x%x setup for axon_msi\n", virq);
/* Enable the MSIC hardware */ /* Enable the MSIC hardware */

2
arch/powerpc/platforms/cell/beat_interrupt.c
View File

@ -143,7 +143,7 @@ static int beatic_pic_host_map(struct irq_host *h, unsigned int virq,
return -EIO; return -EIO;
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_and_handler(virq, &beatic_pic, handle_fasteoi_irq); irq_set_chip_and_handler(virq, &beatic_pic, handle_fasteoi_irq);
return 0; return 0;
} }

14
arch/powerpc/platforms/cell/interrupt.c
View File

@ -101,9 +101,9 @@ static void iic_ioexc_eoi(struct irq_data *d)
static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc) static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
struct cbe_iic_regs __iomem *node_iic = struct cbe_iic_regs __iomem *node_iic =
(void __iomem *)get_irq_desc_data(desc); (void __iomem *)irq_desc_get_handler_data(desc);
unsigned int base = (irq & 0xffffff00) | IIC_IRQ_TYPE_IOEXC; unsigned int base = (irq & 0xffffff00) | IIC_IRQ_TYPE_IOEXC;
unsigned long bits, ack; unsigned long bits, ack;
int cascade; int cascade;
@ -240,14 +240,14 @@ static int iic_host_map(struct irq_host *h, unsigned int virq,
{ {
switch (hw & IIC_IRQ_TYPE_MASK) { switch (hw & IIC_IRQ_TYPE_MASK) {
case IIC_IRQ_TYPE_IPI: case IIC_IRQ_TYPE_IPI:
set_irq_chip_and_handler(virq, &iic_chip, handle_percpu_irq); irq_set_chip_and_handler(virq, &iic_chip, handle_percpu_irq);
break; break;
case IIC_IRQ_TYPE_IOEXC: case IIC_IRQ_TYPE_IOEXC:
set_irq_chip_and_handler(virq, &iic_ioexc_chip, irq_set_chip_and_handler(virq, &iic_ioexc_chip,
handle_iic_irq); handle_iic_irq);
break; break;
default: default:
set_irq_chip_and_handler(virq, &iic_chip, handle_edge_eoi_irq); irq_set_chip_and_handler(virq, &iic_chip, handle_edge_eoi_irq);
} }
return 0; return 0;
} }
@ -364,8 +364,8 @@ static int __init setup_iic(void)
* irq_data is a generic pointer that gets passed back * irq_data is a generic pointer that gets passed back
* to us later, so the forced cast is fine. * to us later, so the forced cast is fine.
*/ */
set_irq_data(cascade, (void __force *)node_iic); irq_set_handler_data(cascade, (void __force *)node_iic);
set_irq_chained_handler(cascade , iic_ioexc_cascade); irq_set_chained_handler(cascade, iic_ioexc_cascade);
out_be64(&node_iic->iic_ir, out_be64(&node_iic->iic_ir,
(1 << 12) /* priority */ | (1 << 12) /* priority */ |
(node << 4) /* dest node */ | (node << 4) /* dest node */ |

8
arch/powerpc/platforms/cell/setup.c
View File

@ -187,8 +187,8 @@ machine_subsys_initcall(cell, cell_publish_devices);
static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc) static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
struct mpic *mpic = get_irq_desc_data(desc); struct mpic *mpic = irq_desc_get_handler_data(desc);
unsigned int virq; unsigned int virq;
virq = mpic_get_one_irq(mpic); virq = mpic_get_one_irq(mpic);
@ -223,8 +223,8 @@ static void __init mpic_init_IRQ(void)
printk(KERN_INFO "%s : hooking up to IRQ %d\n", printk(KERN_INFO "%s : hooking up to IRQ %d\n",
dn->full_name, virq); dn->full_name, virq);
set_irq_data(virq, mpic); irq_set_handler_data(virq, mpic);
set_irq_chained_handler(virq, cell_mpic_cascade); irq_set_chained_handler(virq, cell_mpic_cascade);
} }
} }

12
arch/powerpc/platforms/cell/spider-pic.c
View File

@ -171,10 +171,10 @@ static struct irq_chip spider_pic = {
static int spider_host_map(struct irq_host *h, unsigned int virq, static int spider_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw) irq_hw_number_t hw)
{ {
set_irq_chip_and_handler(virq, &spider_pic, handle_level_irq); irq_set_chip_and_handler(virq, &spider_pic, handle_level_irq);
/* Set default irq type */ /* Set default irq type */
set_irq_type(virq, IRQ_TYPE_NONE); irq_set_irq_type(virq, IRQ_TYPE_NONE);
return 0; return 0;
} }
@ -200,8 +200,8 @@ static struct irq_host_ops spider_host_ops = {
static void spider_irq_cascade(unsigned int irq, struct irq_desc *desc) static void spider_irq_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
struct spider_pic *pic = get_irq_desc_data(desc); struct spider_pic *pic = irq_desc_get_handler_data(desc);
unsigned int cs, virq; unsigned int cs, virq;
cs = in_be32(pic->regs + TIR_CS) >> 24; cs = in_be32(pic->regs + TIR_CS) >> 24;
@ -321,8 +321,8 @@ static void __init spider_init_one(struct device_node *of_node, int chip,
virq = spider_find_cascade_and_node(pic); virq = spider_find_cascade_and_node(pic);
if (virq == NO_IRQ) if (virq == NO_IRQ)
return; return;
set_irq_data(virq, pic); irq_set_handler_data(virq, pic);
set_irq_chained_handler(virq, spider_irq_cascade); irq_set_chained_handler(virq, spider_irq_cascade);
printk(KERN_INFO "spider_pic: node %d, addr: 0x%lx %s\n", printk(KERN_INFO "spider_pic: node %d, addr: 0x%lx %s\n",
pic->node_id, addr, of_node->full_name); pic->node_id, addr, of_node->full_name);

4
arch/powerpc/platforms/chrp/setup.c
View File

@ -365,7 +365,7 @@ void __init chrp_setup_arch(void)
static void chrp_8259_cascade(unsigned int irq, struct irq_desc *desc) static void chrp_8259_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int cascade_irq = i8259_irq(); unsigned int cascade_irq = i8259_irq();
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
@ -517,7 +517,7 @@ static void __init chrp_find_8259(void)
if (cascade_irq == NO_IRQ) if (cascade_irq == NO_IRQ)
printk(KERN_ERR "i8259: failed to map cascade irq\n"); printk(KERN_ERR "i8259: failed to map cascade irq\n");
else else
set_irq_chained_handler(cascade_irq, irq_set_chained_handler(cascade_irq,
chrp_8259_cascade); chrp_8259_cascade);
} }
} }

8
arch/powerpc/platforms/embedded6xx/flipper-pic.c
View File

@ -101,16 +101,16 @@ static struct irq_host *flipper_irq_host;
static int flipper_pic_map(struct irq_host *h, unsigned int virq, static int flipper_pic_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hwirq) irq_hw_number_t hwirq)
{ {
set_irq_chip_data(virq, h->host_data); irq_set_chip_data(virq, h->host_data);
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_and_handler(virq, &flipper_pic, handle_level_irq); irq_set_chip_and_handler(virq, &flipper_pic, handle_level_irq);
return 0; return 0;
} }
static void flipper_pic_unmap(struct irq_host *h, unsigned int irq) static void flipper_pic_unmap(struct irq_host *h, unsigned int irq)
{ {
set_irq_chip_data(irq, NULL); irq_set_chip_data(irq, NULL);
set_irq_chip(irq, NULL); irq_set_chip(irq, NULL);
} }
static int flipper_pic_match(struct irq_host *h, struct device_node *np) static int flipper_pic_match(struct irq_host *h, struct device_node *np)

16
arch/powerpc/platforms/embedded6xx/hlwd-pic.c
View File

@ -94,16 +94,16 @@ static struct irq_host *hlwd_irq_host;
static int hlwd_pic_map(struct irq_host *h, unsigned int virq, static int hlwd_pic_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hwirq) irq_hw_number_t hwirq)
{ {
set_irq_chip_data(virq, h->host_data); irq_set_chip_data(virq, h->host_data);
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_and_handler(virq, &hlwd_pic, handle_level_irq); irq_set_chip_and_handler(virq, &hlwd_pic, handle_level_irq);
return 0; return 0;
} }
static void hlwd_pic_unmap(struct irq_host *h, unsigned int irq) static void hlwd_pic_unmap(struct irq_host *h, unsigned int irq)
{ {
set_irq_chip_data(irq, NULL); irq_set_chip_data(irq, NULL);
set_irq_chip(irq, NULL); irq_set_chip(irq, NULL);
} }
static struct irq_host_ops hlwd_irq_host_ops = { static struct irq_host_ops hlwd_irq_host_ops = {
@ -129,8 +129,8 @@ static unsigned int __hlwd_pic_get_irq(struct irq_host *h)
static void hlwd_pic_irq_cascade(unsigned int cascade_virq, static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
struct irq_desc *desc) struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
struct irq_host *irq_host = get_irq_data(cascade_virq); struct irq_host *irq_host = irq_get_handler_data(cascade_virq);
unsigned int virq; unsigned int virq;
raw_spin_lock(&desc->lock); raw_spin_lock(&desc->lock);
@ -218,8 +218,8 @@ void hlwd_pic_probe(void)
host = hlwd_pic_init(np); host = hlwd_pic_init(np);
BUG_ON(!host); BUG_ON(!host);
cascade_virq = irq_of_parse_and_map(np, 0); cascade_virq = irq_of_parse_and_map(np, 0);
set_irq_data(cascade_virq, host); irq_set_handler_data(cascade_virq, host);
set_irq_chained_handler(cascade_virq, irq_set_chained_handler(cascade_virq,
hlwd_pic_irq_cascade); hlwd_pic_irq_cascade);
hlwd_irq_host = host; hlwd_irq_host = host;
break; break;

4
arch/powerpc/platforms/embedded6xx/holly.c
View File

@ -198,8 +198,8 @@ static void __init holly_init_IRQ(void)
cascade_pci_irq = irq_of_parse_and_map(tsi_pci, 0); cascade_pci_irq = irq_of_parse_and_map(tsi_pci, 0);
pr_debug("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__, (u32) cascade_pci_irq); pr_debug("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__, (u32) cascade_pci_irq);
tsi108_pci_int_init(cascade_node); tsi108_pci_int_init(cascade_node);
set_irq_data(cascade_pci_irq, mpic); irq_set_handler_data(cascade_pci_irq, mpic);
set_irq_chained_handler(cascade_pci_irq, tsi108_irq_cascade); irq_set_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
#endif #endif
/* Configure MPIC outputs to CPU0 */ /* Configure MPIC outputs to CPU0 */
tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0); tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);

4
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
View File

@ -153,8 +153,8 @@ static void __init mpc7448_hpc2_init_IRQ(void)
DBG("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__, DBG("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__,
(u32) cascade_pci_irq); (u32) cascade_pci_irq);
tsi108_pci_int_init(cascade_node); tsi108_pci_int_init(cascade_node);
set_irq_data(cascade_pci_irq, mpic); irq_set_handler_data(cascade_pci_irq, mpic);
set_irq_chained_handler(cascade_pci_irq, tsi108_irq_cascade); irq_set_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
#endif #endif
/* Configure MPIC outputs to CPU0 */ /* Configure MPIC outputs to CPU0 */
tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0); tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);

4
arch/powerpc/platforms/iseries/irq.c
View File

@ -220,7 +220,7 @@ void __init iSeries_activate_IRQs()
if (!desc) if (!desc)
continue; continue;
chip = get_irq_desc_chip(desc); chip = irq_desc_get_chip(desc);
if (chip && chip->irq_startup) { if (chip && chip->irq_startup) {
raw_spin_lock_irqsave(&desc->lock, flags); raw_spin_lock_irqsave(&desc->lock, flags);
chip->irq_startup(&desc->irq_data); chip->irq_startup(&desc->irq_data);
@ -346,7 +346,7 @@ unsigned int iSeries_get_irq(void)
static int iseries_irq_host_map(struct irq_host *h, unsigned int virq, static int iseries_irq_host_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t hw) irq_hw_number_t hw)
{ {
set_irq_chip_and_handler(virq, &iseries_pic, handle_fasteoi_irq); irq_set_chip_and_handler(virq, &iseries_pic, handle_fasteoi_irq);
return 0; return 0;
} }

2
arch/powerpc/platforms/maple/pci.c
View File

@ -498,7 +498,7 @@ void __devinit maple_pci_irq_fixup(struct pci_dev *dev)
printk(KERN_DEBUG "Fixup U4 PCIe IRQ\n"); printk(KERN_DEBUG "Fixup U4 PCIe IRQ\n");
dev->irq = irq_create_mapping(NULL, 1); dev->irq = irq_create_mapping(NULL, 1);
if (dev->irq != NO_IRQ) if (dev->irq != NO_IRQ)
set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
} }
/* Hide AMD8111 IDE interrupt when in legacy mode so /* Hide AMD8111 IDE interrupt when in legacy mode so

2
arch/powerpc/platforms/pasemi/setup.c
View File

@ -239,7 +239,7 @@ static __init void pas_init_IRQ(void)
if (nmiprop) { if (nmiprop) {
nmi_virq = irq_create_mapping(NULL, *nmiprop); nmi_virq = irq_create_mapping(NULL, *nmiprop);
mpic_irq_set_priority(nmi_virq, 15); mpic_irq_set_priority(nmi_virq, 15);
set_irq_type(nmi_virq, IRQ_TYPE_EDGE_RISING); irq_set_irq_type(nmi_virq, IRQ_TYPE_EDGE_RISING);
mpic_unmask_irq(irq_get_irq_data(nmi_virq)); mpic_unmask_irq(irq_get_irq_data(nmi_virq));
} }

2
arch/powerpc/platforms/powermac/pci.c
View File

@ -988,7 +988,7 @@ void __devinit pmac_pci_irq_fixup(struct pci_dev *dev)
dev->vendor == PCI_VENDOR_ID_DEC && dev->vendor == PCI_VENDOR_ID_DEC &&
dev->device == PCI_DEVICE_ID_DEC_TULIP_PLUS) { dev->device == PCI_DEVICE_ID_DEC_TULIP_PLUS) {
dev->irq = irq_create_mapping(NULL, 60); dev->irq = irq_create_mapping(NULL, 60);
set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
} }
#endif /* CONFIG_PPC32 */ #endif /* CONFIG_PPC32 */
} }

12
arch/powerpc/platforms/powermac/pic.c
View File

@ -300,8 +300,8 @@ static int pmac_pic_host_map(struct irq_host *h, unsigned int virq,
level = !!(level_mask[hw >> 5] & (1UL << (hw & 0x1f))); level = !!(level_mask[hw >> 5] & (1UL << (hw & 0x1f)));
if (level) if (level)
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_and_handler(virq, &pmac_pic, level ? irq_set_chip_and_handler(virq, &pmac_pic,
handle_level_irq : handle_edge_irq); level ? handle_level_irq : handle_edge_irq);
return 0; return 0;
} }
@ -471,8 +471,8 @@ int of_irq_map_oldworld(struct device_node *device, int index,
static void pmac_u3_cascade(unsigned int irq, struct irq_desc *desc) static void pmac_u3_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
struct mpic *mpic = get_irq_desc_data(desc); struct mpic *mpic = irq_desc_get_handler_data(desc);
unsigned int cascade_irq = mpic_get_one_irq(mpic); unsigned int cascade_irq = mpic_get_one_irq(mpic);
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
@ -590,8 +590,8 @@ static int __init pmac_pic_probe_mpic(void)
of_node_put(slave); of_node_put(slave);
return 0; return 0;
} }
set_irq_data(cascade, mpic2); irq_set_handler_data(cascade, mpic2);
set_irq_chained_handler(cascade, pmac_u3_cascade); irq_set_chained_handler(cascade, pmac_u3_cascade);
of_node_put(slave); of_node_put(slave);
return 0; return 0;

14
arch/powerpc/platforms/ps3/interrupt.c
View File

@ -194,7 +194,7 @@ static int ps3_virq_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
pr_debug("%s:%d: outlet %lu => cpu %u, virq %u\n", __func__, __LINE__, pr_debug("%s:%d: outlet %lu => cpu %u, virq %u\n", __func__, __LINE__,
outlet, cpu, *virq); outlet, cpu, *virq);
result = set_irq_chip_data(*virq, pd); result = irq_set_chip_data(*virq, pd);
if (result) { if (result) {
pr_debug("%s:%d: set_irq_chip_data failed\n", pr_debug("%s:%d: set_irq_chip_data failed\n",
@ -221,12 +221,12 @@ fail_create:
static int ps3_virq_destroy(unsigned int virq) static int ps3_virq_destroy(unsigned int virq)
{ {
const struct ps3_private *pd = get_irq_chip_data(virq); const struct ps3_private *pd = irq_get_chip_data(virq);
pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__, pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,
__LINE__, pd->ppe_id, pd->thread_id, virq); __LINE__, pd->ppe_id, pd->thread_id, virq);
set_irq_chip_data(virq, NULL); irq_set_chip_data(virq, NULL);
irq_dispose_mapping(virq); irq_dispose_mapping(virq);
pr_debug("%s:%d <-\n", __func__, __LINE__); pr_debug("%s:%d <-\n", __func__, __LINE__);
@ -256,7 +256,7 @@ int ps3_irq_plug_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
goto fail_setup; goto fail_setup;
} }
pd = get_irq_chip_data(*virq); pd = irq_get_chip_data(*virq);
/* Binds outlet to cpu + virq. */ /* Binds outlet to cpu + virq. */
@ -291,7 +291,7 @@ EXPORT_SYMBOL_GPL(ps3_irq_plug_setup);
int ps3_irq_plug_destroy(unsigned int virq) int ps3_irq_plug_destroy(unsigned int virq)
{ {
int result; int result;
const struct ps3_private *pd = get_irq_chip_data(virq); const struct ps3_private *pd = irq_get_chip_data(virq);
pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__, pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,
__LINE__, pd->ppe_id, pd->thread_id, virq); __LINE__, pd->ppe_id, pd->thread_id, virq);
@ -661,7 +661,7 @@ static void dump_bmp(struct ps3_private* pd) {};
static void ps3_host_unmap(struct irq_host *h, unsigned int virq) static void ps3_host_unmap(struct irq_host *h, unsigned int virq)
{ {
set_irq_chip_data(virq, NULL); irq_set_chip_data(virq, NULL);
} }
static int ps3_host_map(struct irq_host *h, unsigned int virq, static int ps3_host_map(struct irq_host *h, unsigned int virq,
@ -670,7 +670,7 @@ static int ps3_host_map(struct irq_host *h, unsigned int virq,
pr_debug("%s:%d: hwirq %lu, virq %u\n", __func__, __LINE__, hwirq, pr_debug("%s:%d: hwirq %lu, virq %u\n", __func__, __LINE__, hwirq,
virq); virq);
set_irq_chip_and_handler(virq, &ps3_irq_chip, handle_fasteoi_irq); irq_set_chip_and_handler(virq, &ps3_irq_chip, handle_fasteoi_irq);
return 0; return 0;
} }

4
arch/powerpc/platforms/pseries/msi.c
View File

@ -137,7 +137,7 @@ static void rtas_teardown_msi_irqs(struct pci_dev *pdev)
if (entry->irq == NO_IRQ) if (entry->irq == NO_IRQ)
continue; continue;
set_irq_msi(entry->irq, NULL); irq_set_msi_desc(entry->irq, NULL);
irq_dispose_mapping(entry->irq); irq_dispose_mapping(entry->irq);
} }
@ -437,7 +437,7 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
} }
dev_dbg(&pdev->dev, "rtas_msi: allocated virq %d\n", virq); dev_dbg(&pdev->dev, "rtas_msi: allocated virq %d\n", virq);
set_irq_msi(virq, entry); irq_set_msi_desc(virq, entry);
/* Read config space back so we can restore after reset */ /* Read config space back so we can restore after reset */
read_msi_msg(virq, &msg); read_msi_msg(virq, &msg);

4
arch/powerpc/platforms/pseries/setup.c
View File

@ -114,7 +114,7 @@ static void __init fwnmi_init(void)
static void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc) static void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int cascade_irq = i8259_irq(); unsigned int cascade_irq = i8259_irq();
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
@ -169,7 +169,7 @@ static void __init pseries_setup_i8259_cascade(void)
printk(KERN_DEBUG "pic: PCI 8259 intack at 0x%016lx\n", intack); printk(KERN_DEBUG "pic: PCI 8259 intack at 0x%016lx\n", intack);
i8259_init(found, intack); i8259_init(found, intack);
of_node_put(found); of_node_put(found);
set_irq_chained_handler(cascade, pseries_8259_cascade); irq_set_chained_handler(cascade, pseries_8259_cascade);
} }
static void __init pseries_mpic_init_IRQ(void) static void __init pseries_mpic_init_IRQ(void)

6
arch/powerpc/platforms/pseries/xics.c
View File

@ -471,7 +471,7 @@ static int xics_host_map(struct irq_host *h, unsigned int virq,
irq_radix_revmap_insert(xics_host, virq, hw); irq_radix_revmap_insert(xics_host, virq, hw);
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_and_handler(virq, xics_irq_chip, handle_fasteoi_irq); irq_set_chip_and_handler(virq, xics_irq_chip, handle_fasteoi_irq);
return 0; return 0;
} }
@ -600,7 +600,7 @@ static void xics_request_ipi(void)
* IPIs are marked IRQF_DISABLED as they must run with irqs * IPIs are marked IRQF_DISABLED as they must run with irqs
* disabled * disabled
*/ */
set_irq_handler(ipi, handle_percpu_irq); irq_set_handler(ipi, handle_percpu_irq);
if (firmware_has_feature(FW_FEATURE_LPAR)) if (firmware_has_feature(FW_FEATURE_LPAR))
rc = request_irq(ipi, xics_ipi_action_lpar, rc = request_irq(ipi, xics_ipi_action_lpar,
IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL); IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);
@ -912,7 +912,7 @@ void xics_migrate_irqs_away(void)
if (desc == NULL || desc->action == NULL) if (desc == NULL || desc->action == NULL)
continue; continue;
chip = get_irq_desc_chip(desc); chip = irq_desc_get_chip(desc);
if (chip == NULL || chip->irq_set_affinity == NULL) if (chip == NULL || chip->irq_set_affinity == NULL)
continue; continue;

2
arch/powerpc/sysdev/cpm1.c
View File

@ -104,7 +104,7 @@ static int cpm_pic_host_map(struct irq_host *h, unsigned int virq,
pr_debug("cpm_pic_host_map(%d, 0x%lx)\n", virq, hw); pr_debug("cpm_pic_host_map(%d, 0x%lx)\n", virq, hw);
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_and_handler(virq, &cpm_pic, handle_fasteoi_irq); irq_set_chip_and_handler(virq, &cpm_pic, handle_fasteoi_irq);
return 0; return 0;
} }

6
arch/powerpc/sysdev/cpm2_pic.c
View File

@ -157,9 +157,9 @@ static int cpm2_set_irq_type(struct irq_data *d, unsigned int flow_type)
irqd_set_trigger_type(d, flow_type); irqd_set_trigger_type(d, flow_type);
if (flow_type & IRQ_TYPE_LEVEL_LOW) if (flow_type & IRQ_TYPE_LEVEL_LOW)
__set_irq_handler_unlocked(d->irq, handle_level_irq); __irq_set_handler_locked(d->irq, handle_level_irq);
else else
__set_irq_handler_unlocked(d->irq, handle_edge_irq); __irq_set_handler_locked(d->irq, handle_edge_irq);
/* internal IRQ senses are LEVEL_LOW /* internal IRQ senses are LEVEL_LOW
* EXT IRQ and Port C IRQ senses are programmable * EXT IRQ and Port C IRQ senses are programmable
@ -220,7 +220,7 @@ static int cpm2_pic_host_map(struct irq_host *h, unsigned int virq,
pr_debug("cpm2_pic_host_map(%d, 0x%lx)\n", virq, hw); pr_debug("cpm2_pic_host_map(%d, 0x%lx)\n", virq, hw);
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_and_handler(virq, &cpm2_pic, handle_level_irq); irq_set_chip_and_handler(virq, &cpm2_pic, handle_level_irq);
return 0; return 0;
} }

20
arch/powerpc/sysdev/fsl_msi.c
View File

@ -66,8 +66,8 @@ static int fsl_msi_host_map(struct irq_host *h, unsigned int virq,
irq_set_status_flags(virq, IRQ_TYPE_EDGE_FALLING); irq_set_status_flags(virq, IRQ_TYPE_EDGE_FALLING);
set_irq_chip_data(virq, msi_data); irq_set_chip_data(virq, msi_data);
set_irq_chip_and_handler(virq, chip, handle_edge_irq); irq_set_chip_and_handler(virq, chip, handle_edge_irq);
return 0; return 0;
} }
@ -110,8 +110,8 @@ static void fsl_teardown_msi_irqs(struct pci_dev *pdev)
list_for_each_entry(entry, &pdev->msi_list, list) { list_for_each_entry(entry, &pdev->msi_list, list) {
if (entry->irq == NO_IRQ) if (entry->irq == NO_IRQ)
continue; continue;
msi_data = get_irq_data(entry->irq); msi_data = irq_get_handler_data(entry->irq);
set_irq_msi(entry->irq, NULL); irq_set_msi_desc(entry->irq, NULL);
msi_bitmap_free_hwirqs(&msi_data->bitmap, msi_bitmap_free_hwirqs(&msi_data->bitmap,
virq_to_hw(entry->irq), 1); virq_to_hw(entry->irq), 1);
irq_dispose_mapping(entry->irq); irq_dispose_mapping(entry->irq);
@ -168,8 +168,8 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
rc = -ENOSPC; rc = -ENOSPC;
goto out_free; goto out_free;
} }
set_irq_data(virq, msi_data); irq_set_handler_data(virq, msi_data);
set_irq_msi(virq, entry); irq_set_msi_desc(virq, entry);
fsl_compose_msi_msg(pdev, hwirq, &msg, msi_data); fsl_compose_msi_msg(pdev, hwirq, &msg, msi_data);
write_msi_msg(virq, &msg); write_msi_msg(virq, &msg);
@ -193,7 +193,7 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
u32 have_shift = 0; u32 have_shift = 0;
struct fsl_msi_cascade_data *cascade_data; struct fsl_msi_cascade_data *cascade_data;
cascade_data = (struct fsl_msi_cascade_data *)get_irq_data(irq); cascade_data = (struct fsl_msi_cascade_data *)irq_get_handler_data(irq);
msi_data = cascade_data->msi_data; msi_data = cascade_data->msi_data;
raw_spin_lock(&desc->lock); raw_spin_lock(&desc->lock);
@ -262,7 +262,7 @@ static int fsl_of_msi_remove(struct platform_device *ofdev)
for (i = 0; i < NR_MSI_REG; i++) { for (i = 0; i < NR_MSI_REG; i++) {
virq = msi->msi_virqs[i]; virq = msi->msi_virqs[i];
if (virq != NO_IRQ) { if (virq != NO_IRQ) {
cascade_data = get_irq_data(virq); cascade_data = irq_get_handler_data(virq);
kfree(cascade_data); kfree(cascade_data);
irq_dispose_mapping(virq); irq_dispose_mapping(virq);
} }
@ -298,8 +298,8 @@ static int __devinit fsl_msi_setup_hwirq(struct fsl_msi *msi,
msi->msi_virqs[irq_index] = virt_msir; msi->msi_virqs[irq_index] = virt_msir;
cascade_data->index = offset + irq_index; cascade_data->index = offset + irq_index;
cascade_data->msi_data = msi; cascade_data->msi_data = msi;
set_irq_data(virt_msir, cascade_data); irq_set_handler_data(virt_msir, cascade_data);
set_irq_chained_handler(virt_msir, fsl_msi_cascade); irq_set_chained_handler(virt_msir, fsl_msi_cascade);
return 0; return 0;
} }

4
arch/powerpc/sysdev/i8259.c
View File

@ -181,7 +181,7 @@ static int i8259_host_map(struct irq_host *h, unsigned int virq,
* be more cautious here but that works for now * be more cautious here but that works for now
*/ */
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_and_handler(virq, &i8259_pic, handle_level_irq); irq_set_chip_and_handler(virq, &i8259_pic, handle_level_irq);
return 0; return 0;
} }
@ -191,7 +191,7 @@ static void i8259_host_unmap(struct irq_host *h, unsigned int virq)
i8259_mask_irq(irq_get_irq_data(virq)); i8259_mask_irq(irq_get_irq_data(virq));
/* remove chip and handler */ /* remove chip and handler */
set_irq_chip_and_handler(virq, NULL, NULL); irq_set_chip_and_handler(virq, NULL, NULL);
/* Make sure it's completed */ /* Make sure it's completed */
synchronize_irq(virq); synchronize_irq(virq);

6
arch/powerpc/sysdev/ipic.c
View File

@ -685,11 +685,11 @@ static int ipic_host_map(struct irq_host *h, unsigned int virq,
{ {
struct ipic *ipic = h->host_data; struct ipic *ipic = h->host_data;
set_irq_chip_data(virq, ipic); irq_set_chip_data(virq, ipic);
set_irq_chip_and_handler(virq, &ipic_level_irq_chip, handle_level_irq); irq_set_chip_and_handler(virq, &ipic_level_irq_chip, handle_level_irq);
/* Set default irq type */ /* Set default irq type */
set_irq_type(virq, IRQ_TYPE_NONE); irq_set_irq_type(virq, IRQ_TYPE_NONE);
return 0; return 0;
} }

4
arch/powerpc/sysdev/mpc8xx_pic.c
View File

@ -80,7 +80,7 @@ static int mpc8xx_set_irq_type(struct irq_data *d, unsigned int flow_type)
if ((hw & 1) == 0) { if ((hw & 1) == 0) {
siel |= (0x80000000 >> hw); siel |= (0x80000000 >> hw);
out_be32(&siu_reg->sc_siel, siel); out_be32(&siu_reg->sc_siel, siel);
__set_irq_handler_unlocked(irq, handle_edge_irq); __irq_set_handler_locked(irq, handle_edge_irq);
} }
} }
return 0; return 0;
@ -117,7 +117,7 @@ static int mpc8xx_pic_host_map(struct irq_host *h, unsigned int virq,
pr_debug("mpc8xx_pic_host_map(%d, 0x%lx)\n", virq, hw); pr_debug("mpc8xx_pic_host_map(%d, 0x%lx)\n", virq, hw);
/* Set default irq handle */ /* Set default irq handle */
set_irq_chip_and_handler(virq, &mpc8xx_pic, handle_level_irq); irq_set_chip_and_handler(virq, &mpc8xx_pic, handle_level_irq);
return 0; return 0;
} }

12
arch/powerpc/sysdev/mpc8xxx_gpio.c
View File

@ -145,7 +145,7 @@ static int mpc8xxx_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
static void mpc8xxx_gpio_irq_cascade(unsigned int irq, struct irq_desc *desc) static void mpc8xxx_gpio_irq_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct mpc8xxx_gpio_chip *mpc8xxx_gc = get_irq_desc_data(desc); struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_desc_get_handler_data(desc);
struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc; struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
unsigned int mask; unsigned int mask;
@ -278,9 +278,9 @@ static int mpc8xxx_gpio_irq_map(struct irq_host *h, unsigned int virq,
if (mpc8xxx_gc->of_dev_id_data) if (mpc8xxx_gc->of_dev_id_data)
mpc8xxx_irq_chip.irq_set_type = mpc8xxx_gc->of_dev_id_data; mpc8xxx_irq_chip.irq_set_type = mpc8xxx_gc->of_dev_id_data;
set_irq_chip_data(virq, h->host_data); irq_set_chip_data(virq, h->host_data);
set_irq_chip_and_handler(virq, &mpc8xxx_irq_chip, handle_level_irq); irq_set_chip_and_handler(virq, &mpc8xxx_irq_chip, handle_level_irq);
set_irq_type(virq, IRQ_TYPE_NONE); irq_set_irq_type(virq, IRQ_TYPE_NONE);
return 0; return 0;
} }
@ -369,8 +369,8 @@ static void __init mpc8xxx_add_controller(struct device_node *np)
out_be32(mm_gc->regs + GPIO_IER, 0xffffffff); out_be32(mm_gc->regs + GPIO_IER, 0xffffffff);
out_be32(mm_gc->regs + GPIO_IMR, 0); out_be32(mm_gc->regs + GPIO_IMR, 0);
set_irq_data(hwirq, mpc8xxx_gc); irq_set_handler_data(hwirq, mpc8xxx_gc);
set_irq_chained_handler(hwirq, mpc8xxx_gpio_irq_cascade); irq_set_chained_handler(hwirq, mpc8xxx_gpio_irq_cascade);
skip_irq: skip_irq:
return; return;

14
arch/powerpc/sysdev/mpic.c
View File

@ -615,7 +615,7 @@ static struct mpic *mpic_find(unsigned int irq)
if (irq < NUM_ISA_INTERRUPTS) if (irq < NUM_ISA_INTERRUPTS)
return NULL; return NULL;
return get_irq_chip_data(irq); return irq_get_chip_data(irq);
} }
/* Determine if the linux irq is an IPI */ /* Determine if the linux irq is an IPI */
@ -649,7 +649,7 @@ static inline struct mpic * mpic_from_ipi(struct irq_data *d)
/* Get the mpic structure from the irq number */ /* Get the mpic structure from the irq number */
static inline struct mpic * mpic_from_irq(unsigned int irq) static inline struct mpic * mpic_from_irq(unsigned int irq)
{ {
return get_irq_chip_data(irq); return irq_get_chip_data(irq);
} }
/* Get the mpic structure from the irq data */ /* Get the mpic structure from the irq data */
@ -978,8 +978,8 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq,
WARN_ON(!(mpic->flags & MPIC_PRIMARY)); WARN_ON(!(mpic->flags & MPIC_PRIMARY));
DBG("mpic: mapping as IPI\n"); DBG("mpic: mapping as IPI\n");
set_irq_chip_data(virq, mpic); irq_set_chip_data(virq, mpic);
set_irq_chip_and_handler(virq, &mpic->hc_ipi, irq_set_chip_and_handler(virq, &mpic->hc_ipi,
handle_percpu_irq); handle_percpu_irq);
return 0; return 0;
} }
@ -1001,11 +1001,11 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq,
DBG("mpic: mapping to irq chip @%p\n", chip); DBG("mpic: mapping to irq chip @%p\n", chip);
set_irq_chip_data(virq, mpic); irq_set_chip_data(virq, mpic);
set_irq_chip_and_handler(virq, chip, handle_fasteoi_irq); irq_set_chip_and_handler(virq, chip, handle_fasteoi_irq);
/* Set default irq type */ /* Set default irq type */
set_irq_type(virq, IRQ_TYPE_NONE); irq_set_irq_type(virq, IRQ_TYPE_NONE);
/* If the MPIC was reset, then all vectors have already been /* If the MPIC was reset, then all vectors have already been
* initialized. Otherwise, a per source lazy initialization * initialized. Otherwise, a per source lazy initialization

8
arch/powerpc/sysdev/mpic_pasemi_msi.c
View File

@ -81,7 +81,7 @@ static void pasemi_msi_teardown_msi_irqs(struct pci_dev *pdev)
if (entry->irq == NO_IRQ) if (entry->irq == NO_IRQ)
continue; continue;
set_irq_msi(entry->irq, NULL); irq_set_msi_desc(entry->irq, NULL);
msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap, msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap,
virq_to_hw(entry->irq), ALLOC_CHUNK); virq_to_hw(entry->irq), ALLOC_CHUNK);
irq_dispose_mapping(entry->irq); irq_dispose_mapping(entry->irq);
@ -131,9 +131,9 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
*/ */
mpic_set_vector(virq, 0); mpic_set_vector(virq, 0);
set_irq_msi(virq, entry); irq_set_msi_desc(virq, entry);
set_irq_chip(virq, &mpic_pasemi_msi_chip); irq_set_chip(virq, &mpic_pasemi_msi_chip);
set_irq_type(virq, IRQ_TYPE_EDGE_RISING); irq_set_irq_type(virq, IRQ_TYPE_EDGE_RISING);
pr_debug("pasemi_msi: allocated virq 0x%x (hw 0x%x) " \ pr_debug("pasemi_msi: allocated virq 0x%x (hw 0x%x) " \
"addr 0x%x\n", virq, hwirq, msg.address_lo); "addr 0x%x\n", virq, hwirq, msg.address_lo);

8
arch/powerpc/sysdev/mpic_u3msi.c
View File

@ -129,7 +129,7 @@ static void u3msi_teardown_msi_irqs(struct pci_dev *pdev)
if (entry->irq == NO_IRQ) if (entry->irq == NO_IRQ)
continue; continue;
set_irq_msi(entry->irq, NULL); irq_set_msi_desc(entry->irq, NULL);
msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap, msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap,
virq_to_hw(entry->irq), 1); virq_to_hw(entry->irq), 1);
irq_dispose_mapping(entry->irq); irq_dispose_mapping(entry->irq);
@ -166,9 +166,9 @@ static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
return -ENOSPC; return -ENOSPC;
} }
set_irq_msi(virq, entry); irq_set_msi_desc(virq, entry);
set_irq_chip(virq, &mpic_u3msi_chip); irq_set_chip(virq, &mpic_u3msi_chip);
set_irq_type(virq, IRQ_TYPE_EDGE_RISING); irq_set_irq_type(virq, IRQ_TYPE_EDGE_RISING);
pr_debug("u3msi: allocated virq 0x%x (hw 0x%x) addr 0x%lx\n", pr_debug("u3msi: allocated virq 0x%x (hw 0x%x) addr 0x%lx\n",
virq, hwirq, (unsigned long)addr); virq, hwirq, (unsigned long)addr);

3
arch/powerpc/sysdev/mv64x60_pic.c
View File

@ -217,7 +217,8 @@ static int mv64x60_host_map(struct irq_host *h, unsigned int virq,
level1 = (hwirq & MV64x60_LEVEL1_MASK) >> MV64x60_LEVEL1_OFFSET; level1 = (hwirq & MV64x60_LEVEL1_MASK) >> MV64x60_LEVEL1_OFFSET;
BUG_ON(level1 > MV64x60_LEVEL1_GPP); BUG_ON(level1 > MV64x60_LEVEL1_GPP);
set_irq_chip_and_handler(virq, mv64x60_chips[level1], handle_level_irq); irq_set_chip_and_handler(virq, mv64x60_chips[level1],
handle_level_irq);
return 0; return 0;
} }

14
arch/powerpc/sysdev/qe_lib/qe_ic.c
View File

@ -189,7 +189,7 @@ static inline void qe_ic_write(volatile __be32 __iomem * base, unsigned int reg
static inline struct qe_ic *qe_ic_from_irq(unsigned int virq) static inline struct qe_ic *qe_ic_from_irq(unsigned int virq)
{ {
return get_irq_chip_data(virq); return irq_get_chip_data(virq);
} }
static inline struct qe_ic *qe_ic_from_irq_data(struct irq_data *d) static inline struct qe_ic *qe_ic_from_irq_data(struct irq_data *d)
@ -267,10 +267,10 @@ static int qe_ic_host_map(struct irq_host *h, unsigned int virq,
/* Default chip */ /* Default chip */
chip = &qe_ic->hc_irq; chip = &qe_ic->hc_irq;
set_irq_chip_data(virq, qe_ic); irq_set_chip_data(virq, qe_ic);
irq_set_status_flags(virq, IRQ_LEVEL); irq_set_status_flags(virq, IRQ_LEVEL);
set_irq_chip_and_handler(virq, chip, handle_level_irq); irq_set_chip_and_handler(virq, chip, handle_level_irq);
return 0; return 0;
} }
@ -386,13 +386,13 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags,
qe_ic_write(qe_ic->regs, QEIC_CICR, temp); qe_ic_write(qe_ic->regs, QEIC_CICR, temp);
set_irq_data(qe_ic->virq_low, qe_ic); irq_set_handler_data(qe_ic->virq_low, qe_ic);
set_irq_chained_handler(qe_ic->virq_low, low_handler); irq_set_chained_handler(qe_ic->virq_low, low_handler);
if (qe_ic->virq_high != NO_IRQ && if (qe_ic->virq_high != NO_IRQ &&
qe_ic->virq_high != qe_ic->virq_low) { qe_ic->virq_high != qe_ic->virq_low) {
set_irq_data(qe_ic->virq_high, qe_ic); irq_set_handler_data(qe_ic->virq_high, qe_ic);
set_irq_chained_handler(qe_ic->virq_high, high_handler); irq_set_chained_handler(qe_ic->virq_high, high_handler);
} }
} }

4
arch/powerpc/sysdev/tsi108_pci.c
View File

@ -392,7 +392,7 @@ static int pci_irq_host_map(struct irq_host *h, unsigned int virq,
if ((virq >= 1) && (virq <= 4)){ if ((virq >= 1) && (virq <= 4)){
irq = virq + IRQ_PCI_INTAD_BASE - 1; irq = virq + IRQ_PCI_INTAD_BASE - 1;
irq_set_status_flags(irq, IRQ_LEVEL); irq_set_status_flags(irq, IRQ_LEVEL);
set_irq_chip(irq, &tsi108_pci_irq); irq_set_chip(irq, &tsi108_pci_irq);
} }
return 0; return 0;
} }
@ -431,7 +431,7 @@ void __init tsi108_pci_int_init(struct device_node *node)
void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc) void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int cascade_irq = get_pci_source(); unsigned int cascade_irq = get_pci_source();
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)

14
arch/powerpc/sysdev/uic.c
View File

@ -182,13 +182,13 @@ static int uic_host_map(struct irq_host *h, unsigned int virq,
{ {
struct uic *uic = h->host_data; struct uic *uic = h->host_data;
set_irq_chip_data(virq, uic); irq_set_chip_data(virq, uic);
/* Despite the name, handle_level_irq() works for both level /* Despite the name, handle_level_irq() works for both level
* and edge irqs on UIC. FIXME: check this is correct */ * and edge irqs on UIC. FIXME: check this is correct */
set_irq_chip_and_handler(virq, &uic_irq_chip, handle_level_irq); irq_set_chip_and_handler(virq, &uic_irq_chip, handle_level_irq);
/* Set default irq type */ /* Set default irq type */
set_irq_type(virq, IRQ_TYPE_NONE); irq_set_irq_type(virq, IRQ_TYPE_NONE);
return 0; return 0;
} }
@ -212,9 +212,9 @@ static struct irq_host_ops uic_host_ops = {
void uic_irq_cascade(unsigned int virq, struct irq_desc *desc) void uic_irq_cascade(unsigned int virq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
struct irq_data *idata = irq_desc_get_irq_data(desc); struct irq_data *idata = irq_desc_get_irq_data(desc);
struct uic *uic = get_irq_data(virq); struct uic *uic = irq_get_handler_data(virq);
u32 msr; u32 msr;
int src; int src;
int subvirq; int subvirq;
@ -329,8 +329,8 @@ void __init uic_init_tree(void)
cascade_virq = irq_of_parse_and_map(np, 0); cascade_virq = irq_of_parse_and_map(np, 0);
set_irq_data(cascade_virq, uic); irq_set_handler_data(cascade_virq, uic);
set_irq_chained_handler(cascade_virq, uic_irq_cascade); irq_set_chained_handler(cascade_virq, uic_irq_cascade);
/* FIXME: setup critical cascade?? */ /* FIXME: setup critical cascade?? */
} }

14
arch/powerpc/sysdev/xilinx_intc.c
View File

@ -164,15 +164,15 @@ static int xilinx_intc_xlate(struct irq_host *h, struct device_node *ct,
static int xilinx_intc_map(struct irq_host *h, unsigned int virq, static int xilinx_intc_map(struct irq_host *h, unsigned int virq,
irq_hw_number_t irq) irq_hw_number_t irq)
{ {
set_irq_chip_data(virq, h->host_data); irq_set_chip_data(virq, h->host_data);
if (xilinx_intc_typetable[irq] == IRQ_TYPE_LEVEL_HIGH || if (xilinx_intc_typetable[irq] == IRQ_TYPE_LEVEL_HIGH ||
xilinx_intc_typetable[irq] == IRQ_TYPE_LEVEL_LOW) { xilinx_intc_typetable[irq] == IRQ_TYPE_LEVEL_LOW) {
set_irq_chip_and_handler(virq, &xilinx_intc_level_irqchip, irq_set_chip_and_handler(virq, &xilinx_intc_level_irqchip,
handle_level_irq); handle_level_irq);
} else { } else {
set_irq_chip_and_handler(virq, &xilinx_intc_edge_irqchip, irq_set_chip_and_handler(virq, &xilinx_intc_edge_irqchip,
handle_edge_irq); handle_edge_irq);
} }
return 0; return 0;
} }
@ -223,7 +223,7 @@ int xilinx_intc_get_irq(void)
*/ */
static void xilinx_i8259_cascade(unsigned int irq, struct irq_desc *desc) static void xilinx_i8259_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int cascade_irq = i8259_irq(); unsigned int cascade_irq = i8259_irq();
if (cascade_irq) if (cascade_irq)
@ -250,7 +250,7 @@ static void __init xilinx_i8259_setup_cascade(void)
} }
i8259_init(cascade_node, 0); i8259_init(cascade_node, 0);
set_irq_chained_handler(cascade_irq, xilinx_i8259_cascade); irq_set_chained_handler(cascade_irq, xilinx_i8259_cascade);
/* Program irq 7 (usb/audio), 14/15 (ide) to level sensitive */ /* Program irq 7 (usb/audio), 14/15 (ide) to level sensitive */
/* This looks like a dirty hack to me --gcl */ /* This looks like a dirty hack to me --gcl */