diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2023-02-18 12:15:46 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2023-03-14 16:52:10 +0300 |
| commit | 1c96fcdef8c7492ecf34ed70102a1ae5253ef9d1 (patch) | |
| tree | 81d6d46f95d3884c7af54e2f4138d49bdfc397bc /arch/powerpc/platforms/82xx | |
| parent | 2fc39acfcacf3dc1392d8062f6d7b7d94eb2537c (diff) | |
| download | linux-1c96fcdef8c7492ecf34ed70102a1ae5253ef9d1.tar.xz | |
powerpc/platforms: Use 'compatible' property for simple cases
Use the new 'compatible' property for simple cases.
checkpatch complains about the new compatible being undocumented
but in reality nothing is new so just ignore it for the time
being.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/6cb9865d916231c38401ba34ad1a98c249fae135.1676711562.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc/platforms/82xx')
| -rw-r--r-- | arch/powerpc/platforms/82xx/ep8248e.c | 10 | ||||
| -rw-r--r-- | arch/powerpc/platforms/82xx/km82xx.c | 10 | ||||
| -rw-r--r-- | arch/powerpc/platforms/82xx/mpc8272_ads.c | 10 | ||||
| -rw-r--r-- | arch/powerpc/platforms/82xx/pq2fads.c | 10 |
4 files changed, 4 insertions, 36 deletions
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c index 28e627f8a320..66defdaf816f 100644 --- a/arch/powerpc/platforms/82xx/ep8248e.c +++ b/arch/powerpc/platforms/82xx/ep8248e.c @@ -301,18 +301,10 @@ static int __init declare_of_platform_devices(void) } machine_device_initcall(ep8248e, declare_of_platform_devices); -/* - * Called very early, device-tree isn't unflattened - */ -static int __init ep8248e_probe(void) -{ - return of_machine_is_compatible("fsl,ep8248e"); -} - define_machine(ep8248e) { .name = "Embedded Planet EP8248E", - .probe = ep8248e_probe, + .compatible = "fsl,ep8248e", .setup_arch = ep8248e_setup_arch, .init_IRQ = ep8248e_pic_init, .get_irq = cpm2_get_irq, diff --git a/arch/powerpc/platforms/82xx/km82xx.c b/arch/powerpc/platforms/82xx/km82xx.c index 1c8bbf4251d9..8ab575d70080 100644 --- a/arch/powerpc/platforms/82xx/km82xx.c +++ b/arch/powerpc/platforms/82xx/km82xx.c @@ -188,18 +188,10 @@ static int __init declare_of_platform_devices(void) } machine_device_initcall(km82xx, declare_of_platform_devices); -/* - * Called very early, device-tree isn't unflattened - */ -static int __init km82xx_probe(void) -{ - return of_machine_is_compatible("keymile,km82xx"); -} - define_machine(km82xx) { .name = "Keymile km82xx", - .probe = km82xx_probe, + .compatible = "keymile,km82xx", .setup_arch = km82xx_setup_arch, .init_IRQ = km82xx_pic_init, .get_irq = cpm2_get_irq, diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c index 0b5b9dec16d5..5dd034ed2c87 100644 --- a/arch/powerpc/platforms/82xx/mpc8272_ads.c +++ b/arch/powerpc/platforms/82xx/mpc8272_ads.c @@ -191,18 +191,10 @@ static int __init declare_of_platform_devices(void) } machine_device_initcall(mpc8272_ads, declare_of_platform_devices); -/* - * Called very early, device-tree isn't unflattened - */ -static int __init mpc8272_ads_probe(void) -{ - return of_machine_is_compatible("fsl,mpc8272ads"); -} - define_machine(mpc8272_ads) { .name = "Freescale MPC8272 ADS", - .probe = mpc8272_ads_probe, + .compatible = "fsl,mpc8272ads", .setup_arch = mpc8272_ads_setup_arch, .discover_phbs = pq2_init_pci, .init_IRQ = mpc8272_ads_pic_init, diff --git a/arch/powerpc/platforms/82xx/pq2fads.c b/arch/powerpc/platforms/82xx/pq2fads.c index ac9113d524af..d91dfdc634e9 100644 --- a/arch/powerpc/platforms/82xx/pq2fads.c +++ b/arch/powerpc/platforms/82xx/pq2fads.c @@ -154,14 +154,6 @@ static void __init pq2fads_setup_arch(void) ppc_md.progress("pq2fads_setup_arch(), finish", 0); } -/* - * Called very early, device-tree isn't unflattened - */ -static int __init pq2fads_probe(void) -{ - return of_machine_is_compatible("fsl,pq2fads"); -} - static const struct of_device_id of_bus_ids[] __initconst = { { .name = "soc", }, { .name = "cpm", }, @@ -180,7 +172,7 @@ machine_device_initcall(pq2fads, declare_of_platform_devices); define_machine(pq2fads) { .name = "Freescale PQ2FADS", - .probe = pq2fads_probe, + .compatible = "fsl,pq2fads", .setup_arch = pq2fads_setup_arch, .discover_phbs = pq2_init_pci, .init_IRQ = pq2fads_pic_init, |