| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CADRPPNT4+zZd6fezcDcN=0EcezR4mHqnrOBBEexqBLyrV_THXQ@mail.gmail.com>
Date: Wed, 20 Nov 2019 11:59:34 -0600
From: Li Yang <leoyang.li@....com>
To: Rasmus Villemoes <linux@...musvillemoes.dk>,
Scott Wood <oss@...error.net>
Cc: Qiang Zhao <qiang.zhao@....com>,
Christophe Leroy <christophe.leroy@....fr>,
linuxppc-dev <linuxppc-dev@...ts.ozlabs.org>,
"moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE"
<linux-arm-kernel@...ts.infradead.org>,
lkml <linux-kernel@...r.kernel.org>,
Timur Tabi <timur@...nel.org>
Subject: Re: [PATCH v5 13/48] powerpc/83xx: remove mpc83xx_ipic_and_qe_init_IRQ
On Mon, Nov 18, 2019 at 5:29 AM Rasmus Villemoes
<linux@...musvillemoes.dk> wrote:
Hi Scott,
What do you think of the PowerPC related changes(patch 13,14)? Can we
have you ACK and merge the series from soc tree?
Regards,
Leo
>
> This is now exactly the same as mpc83xx_ipic_init_IRQ, so just use
> that directly.
>
> Signed-off-by: Rasmus Villemoes <linux@...musvillemoes.dk>
> ---
> arch/powerpc/platforms/83xx/km83xx.c | 2 +-
> arch/powerpc/platforms/83xx/misc.c | 7 -------
> arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 +-
> arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +-
> arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 +-
> arch/powerpc/platforms/83xx/mpc836x_rdk.c | 2 +-
> arch/powerpc/platforms/83xx/mpc83xx.h | 5 -----
> 7 files changed, 5 insertions(+), 17 deletions(-)
>
> diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c
> index 5c6227f7bc37..3d89569e9e71 100644
> --- a/arch/powerpc/platforms/83xx/km83xx.c
> +++ b/arch/powerpc/platforms/83xx/km83xx.c
> @@ -177,7 +177,7 @@ define_machine(mpc83xx_km) {
> .name = "mpc83xx-km-platform",
> .probe = mpc83xx_km_probe,
> .setup_arch = mpc83xx_km_setup_arch,
> - .init_IRQ = mpc83xx_ipic_and_qe_init_IRQ,
> + .init_IRQ = mpc83xx_ipic_init_IRQ,
> .get_irq = ipic_get_irq,
> .restart = mpc83xx_restart,
> .time_init = mpc83xx_time_init,
> diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c
> index 6935a5b9fbd1..1d8306eb2958 100644
> --- a/arch/powerpc/platforms/83xx/misc.c
> +++ b/arch/powerpc/platforms/83xx/misc.c
> @@ -88,13 +88,6 @@ void __init mpc83xx_ipic_init_IRQ(void)
> ipic_set_default_priority();
> }
>
> -#ifdef CONFIG_QUICC_ENGINE
> -void __init mpc83xx_ipic_and_qe_init_IRQ(void)
> -{
> - mpc83xx_ipic_init_IRQ();
> -}
> -#endif /* CONFIG_QUICC_ENGINE */
> -
> static const struct of_device_id of_bus_ids[] __initconst = {
> { .type = "soc", },
> { .compatible = "soc", },
> diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
> index 1c73af104d19..6fa5402ebf20 100644
> --- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
> +++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
> @@ -101,7 +101,7 @@ define_machine(mpc832x_mds) {
> .name = "MPC832x MDS",
> .probe = mpc832x_sys_probe,
> .setup_arch = mpc832x_sys_setup_arch,
> - .init_IRQ = mpc83xx_ipic_and_qe_init_IRQ,
> + .init_IRQ = mpc83xx_ipic_init_IRQ,
> .get_irq = ipic_get_irq,
> .restart = mpc83xx_restart,
> .time_init = mpc83xx_time_init,
> diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
> index 87f68ca06255..622c625d5ce4 100644
> --- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
> +++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
> @@ -219,7 +219,7 @@ define_machine(mpc832x_rdb) {
> .name = "MPC832x RDB",
> .probe = mpc832x_rdb_probe,
> .setup_arch = mpc832x_rdb_setup_arch,
> - .init_IRQ = mpc83xx_ipic_and_qe_init_IRQ,
> + .init_IRQ = mpc83xx_ipic_init_IRQ,
> .get_irq = ipic_get_irq,
> .restart = mpc83xx_restart,
> .time_init = mpc83xx_time_init,
> diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
> index 5b484da9533e..219a83ab6c00 100644
> --- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
> +++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
> @@ -208,7 +208,7 @@ define_machine(mpc836x_mds) {
> .name = "MPC836x MDS",
> .probe = mpc836x_mds_probe,
> .setup_arch = mpc836x_mds_setup_arch,
> - .init_IRQ = mpc83xx_ipic_and_qe_init_IRQ,
> + .init_IRQ = mpc83xx_ipic_init_IRQ,
> .get_irq = ipic_get_irq,
> .restart = mpc83xx_restart,
> .time_init = mpc83xx_time_init,
> diff --git a/arch/powerpc/platforms/83xx/mpc836x_rdk.c b/arch/powerpc/platforms/83xx/mpc836x_rdk.c
> index b7119e443920..b4aac2cde849 100644
> --- a/arch/powerpc/platforms/83xx/mpc836x_rdk.c
> +++ b/arch/powerpc/platforms/83xx/mpc836x_rdk.c
> @@ -41,7 +41,7 @@ define_machine(mpc836x_rdk) {
> .name = "MPC836x RDK",
> .probe = mpc836x_rdk_probe,
> .setup_arch = mpc836x_rdk_setup_arch,
> - .init_IRQ = mpc83xx_ipic_and_qe_init_IRQ,
> + .init_IRQ = mpc83xx_ipic_init_IRQ,
> .get_irq = ipic_get_irq,
> .restart = mpc83xx_restart,
> .time_init = mpc83xx_time_init,
> diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h
> index d343f6ce2599..f37d04332fc7 100644
> --- a/arch/powerpc/platforms/83xx/mpc83xx.h
> +++ b/arch/powerpc/platforms/83xx/mpc83xx.h
> @@ -72,11 +72,6 @@ extern int mpc837x_usb_cfg(void);
> extern int mpc834x_usb_cfg(void);
> extern int mpc831x_usb_cfg(void);
> extern void mpc83xx_ipic_init_IRQ(void);
> -#ifdef CONFIG_QUICC_ENGINE
> -extern void mpc83xx_ipic_and_qe_init_IRQ(void);
> -#else
> -#define mpc83xx_ipic_and_qe_init_IRQ mpc83xx_ipic_init_IRQ
> -#endif /* CONFIG_QUICC_ENGINE */
>
> #ifdef CONFIG_PCI
> extern void mpc83xx_setup_pci(void);
> --
> 2.23.0
>
Powered by blists - more mailing lists