Skip to content

Commit 8035d9f

Browse files
Jiri Slaby (SUSE)KAGA-KOKO
authored andcommitted
powerpc: Switch to irq_find_mapping()
irq_linear_revmap() is deprecated, so remove all its uses and supersede them by an identical call to irq_find_mapping(). [ tglx: Fix up subject prefix ] Signed-off-by: Jiri Slaby (SUSE) <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Christophe Leroy <[email protected]> # for 8xx Link: https://lore.kernel.org/all/[email protected]
1 parent 42b8b16 commit 8035d9f

File tree

14 files changed

+15
-15
lines changed

14 files changed

+15
-15
lines changed

arch/powerpc/platforms/44x/uic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,5 +328,5 @@ unsigned int uic_get_irq(void)
328328
msr = mfdcr(primary_uic->dcrbase + UIC_MSR);
329329
src = 32 - ffs(msr);
330330

331-
return irq_linear_revmap(primary_uic->irqhost, src);
331+
return irq_find_mapping(primary_uic->irqhost, src);
332332
}

arch/powerpc/platforms/52xx/mpc52xx_gpt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ struct mpc52xx_gpt_priv *mpc52xx_gpt_from_irq(int irq)
369369
mutex_lock(&mpc52xx_gpt_list_mutex);
370370
list_for_each(pos, &mpc52xx_gpt_list) {
371371
gpt = container_of(pos, struct mpc52xx_gpt_priv, list);
372-
if (gpt->irqhost && irq == irq_linear_revmap(gpt->irqhost, 0)) {
372+
if (gpt->irqhost && irq == irq_find_mapping(gpt->irqhost, 0)) {
373373
mutex_unlock(&mpc52xx_gpt_list_mutex);
374374
return gpt;
375375
}

arch/powerpc/platforms/52xx/mpc52xx_pic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,5 +515,5 @@ unsigned int mpc52xx_get_irq(void)
515515
return 0;
516516
}
517517

518-
return irq_linear_revmap(mpc52xx_irqhost, irq);
518+
return irq_find_mapping(mpc52xx_irqhost, irq);
519519
}

arch/powerpc/platforms/85xx/socrates_fpga_pic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static inline unsigned int socrates_fpga_pic_get_irq(unsigned int irq)
8383
if (cause >> (i + 16))
8484
break;
8585
}
86-
return irq_linear_revmap(socrates_fpga_pic_irq_host,
86+
return irq_find_mapping(socrates_fpga_pic_irq_host,
8787
(irq_hw_number_t)i);
8888
}
8989

arch/powerpc/platforms/8xx/cpm1-ic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static int cpm_get_irq(struct irq_desc *desc)
5959
cpm_vec = in_be16(&data->reg->cpic_civr);
6060
cpm_vec >>= 11;
6161

62-
return irq_linear_revmap(data->host, cpm_vec);
62+
return irq_find_mapping(data->host, cpm_vec);
6363
}
6464

6565
static void cpm_cascade(struct irq_desc *desc)

arch/powerpc/platforms/8xx/pic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ unsigned int mpc8xx_get_irq(void)
8080
if (irq == PIC_VEC_SPURRIOUS)
8181
return 0;
8282

83-
return irq_linear_revmap(mpc8xx_pic_host, irq);
83+
return irq_find_mapping(mpc8xx_pic_host, irq);
8484

8585
}
8686

arch/powerpc/platforms/embedded6xx/flipper-pic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ unsigned int flipper_pic_get_irq(void)
173173
return 0; /* no more IRQs pending */
174174

175175
irq = __ffs(irq_status);
176-
return irq_linear_revmap(flipper_irq_host, irq);
176+
return irq_find_mapping(flipper_irq_host, irq);
177177
}
178178

179179
/*

arch/powerpc/platforms/embedded6xx/hlwd-pic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ static struct irq_domain *__init hlwd_pic_init(struct device_node *np)
190190
unsigned int hlwd_pic_get_irq(void)
191191
{
192192
unsigned int hwirq = __hlwd_pic_get_irq(hlwd_irq_host);
193-
return hwirq ? irq_linear_revmap(hlwd_irq_host, hwirq) : 0;
193+
return hwirq ? irq_find_mapping(hlwd_irq_host, hwirq) : 0;
194194
}
195195

196196
/*

arch/powerpc/platforms/powermac/pic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static unsigned int pmac_pic_get_irq(void)
250250
raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
251251
if (unlikely(irq < 0))
252252
return 0;
253-
return irq_linear_revmap(pmac_pic_host, irq);
253+
return irq_find_mapping(pmac_pic_host, irq);
254254
}
255255

256256
static int pmac_pic_host_match(struct irq_domain *h, struct device_node *node,

arch/powerpc/sysdev/cpm2_pic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ unsigned int cpm2_get_irq(void)
207207

208208
if (irq == 0)
209209
return(-1);
210-
return irq_linear_revmap(cpm2_pic_host, irq);
210+
return irq_find_mapping(cpm2_pic_host, irq);
211211
}
212212

213213
static int cpm2_pic_host_map(struct irq_domain *h, unsigned int virq,

0 commit comments

Comments
 (0)