powerpc: Make generic_calibrate_decr() the default

ppc_md.calibrate_decr() is a mandatory item. Its nullity is never
checked so it must be non null on all platforms.

Most platforms define generic_calibrate_decr() as their
ppc_md.calibrate_decr(). Have time_init() call
generic_calibrate_decr() when ppc_md.calibrate_decr() is NULL,
and remove default assignment from all machines.

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

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 9d86659..df20cf2 100644 (file)
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -887,7 +887,11 @@ void __init time_init(void)
        unsigned shift;
 
        /* Normal PowerPC with timebase register */
-       ppc_md.calibrate_decr();
+       if (ppc_md.calibrate_decr)
+               ppc_md.calibrate_decr();
+       else
+               generic_calibrate_decr();
+
        printk(KERN_DEBUG "time_init: decrementer frequency = %lu.%.6lu MHz\n",
               ppc_tb_freq / 1000000, ppc_tb_freq % 1000000);
        printk(KERN_DEBUG "time_init: processor frequency   = %lu.%.6lu MHz\n",

diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
index dce696c..e454e9d 100644 (file)
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@ -74,5 +74,4 @@ define_machine(ppc40x_simple) {
        .init_IRQ = uic_init_tree,
        .get_irq = uic_get_irq,
        .restart = ppc4xx_reset_system,
-       .calibrate_decr = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/canyonlands.c b/arch/powerpc/platforms/44x/canyonlands.c
index ba561ca..8742a10 100644 (file)
--- a/arch/powerpc/platforms/44x/canyonlands.c
+++ b/arch/powerpc/platforms/44x/canyonlands.c
@@ -114,5 +114,4 @@ define_machine(canyonlands) {
        .init_IRQ = uic_init_tree,
        .get_irq = uic_get_irq,
        .restart = ppc4xx_reset_system,
-       .calibrate_decr = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index 5b9e57b..4861310 100644 (file)
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -58,5 +58,4 @@ define_machine(ebony) {
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
        .restart                = ppc4xx_reset_system,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/fsp2.c b/arch/powerpc/platforms/44x/fsp2.c
index 56d91db..f6b8d02 100644 (file)
--- a/arch/powerpc/platforms/44x/fsp2.c
+++ b/arch/powerpc/platforms/44x/fsp2.c
@@ -313,5 +313,4 @@ define_machine(fsp2) {
        .init_IRQ               = fsp2_irq_init,
        .get_irq                = uic_get_irq,
        .restart                = ppc4xx_reset_system,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/iss4xx.c b/arch/powerpc/platforms/44x/iss4xx.c
index e779bd3..981972e 100644 (file)
--- a/arch/powerpc/platforms/44x/iss4xx.c
+++ b/arch/powerpc/platforms/44x/iss4xx.c
@@ -147,5 +147,4 @@ define_machine(iss4xx) {
        .init_IRQ               = iss4xx_init_irq,
        .setup_arch             = iss4xx_setup_arch,
        .restart                = ppc4xx_reset_system,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c
index 2a0dcdf..971786f 100644 (file)
--- a/arch/powerpc/platforms/44x/ppc44x_simple.c
+++ b/arch/powerpc/platforms/44x/ppc44x_simple.c
@@ -82,5 +82,4 @@ define_machine(ppc44x_simple) {
        .init_IRQ = uic_init_tree,
        .get_irq = uic_get_irq,
        .restart = ppc4xx_reset_system,
-       .calibrate_decr = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/ppc476.c b/arch/powerpc/platforms/44x/ppc476.c
index 4641ae8..3135e65 100644 (file)
--- a/arch/powerpc/platforms/44x/ppc476.c
+++ b/arch/powerpc/platforms/44x/ppc476.c
@@ -277,7 +277,6 @@ define_machine(ppc47x_akebono) {
        .init_IRQ               = ppc47x_init_irq,
        .setup_arch             = ppc47x_setup_arch,
        .restart                = ppc4xx_reset_system,
-       .calibrate_decr         = generic_calibrate_decr,
 };
 
 define_machine(ppc47x_currituck) {
@@ -288,5 +287,4 @@ define_machine(ppc47x_currituck) {
        .pci_irq_fixup          = ppc47x_pci_irq_fixup,
        .setup_arch             = ppc47x_setup_arch,
        .restart                = ppc4xx_reset_system,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/sam440ep.c b/arch/powerpc/platforms/44x/sam440ep.c
index 8b281e0..5cdaa40 100644 (file)
--- a/arch/powerpc/platforms/44x/sam440ep.c
+++ b/arch/powerpc/platforms/44x/sam440ep.c
@@ -54,7 +54,6 @@ define_machine(sam440ep) {
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
        .restart                = ppc4xx_reset_system,
-       .calibrate_decr         = generic_calibrate_decr,
 };
 
 static struct i2c_board_info sam440ep_rtc_info = {

diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index acbc356..bfeb9bd 100644 (file)
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -48,7 +48,6 @@ define_machine(warp) {
        .init_IRQ       = uic_init_tree,
        .get_irq        = uic_get_irq,
        .restart        = ppc4xx_reset_system,
-       .calibrate_decr = generic_calibrate_decr,
 };
 
 

diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c
index 0b6a2d3..80b25ce 100644 (file)
--- a/arch/powerpc/platforms/512x/mpc5121_ads.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads.c
@@ -67,6 +67,5 @@ define_machine(mpc5121_ads) {
        .init                   = mpc512x_init,
        .init_IRQ               = mpc5121_ads_init_IRQ,
        .get_irq                = ipic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .restart                = mpc512x_restart,
 };

diff --git a/arch/powerpc/platforms/512x/mpc512x_generic.c b/arch/powerpc/platforms/512x/mpc512x_generic.c
index 364564c..97dfaac 100644 (file)
--- a/arch/powerpc/platforms/512x/mpc512x_generic.c
+++ b/arch/powerpc/platforms/512x/mpc512x_generic.c
@@ -47,6 +47,5 @@ define_machine(mpc512x_generic) {
        .setup_arch             = mpc512x_setup_arch,
        .init_IRQ               = mpc512x_init_IRQ,
        .get_irq                = ipic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .restart                = mpc512x_restart,
 };

diff --git a/arch/powerpc/platforms/512x/pdm360ng.c b/arch/powerpc/platforms/512x/pdm360ng.c
index d3a4eeb..4bdec1c 100644 (file)
--- a/arch/powerpc/platforms/512x/pdm360ng.c
+++ b/arch/powerpc/platforms/512x/pdm360ng.c
@@ -121,6 +121,5 @@ define_machine(pdm360ng) {
        .init                   = pdm360ng_init,
        .init_IRQ               = mpc512x_init_IRQ,
        .get_irq                = ipic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .restart                = mpc512x_restart,
 };

diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index 61dfec7..aa82e6b 100644 (file)
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -226,7 +226,6 @@ define_machine(efika)
        .get_rtc_time           = rtas_get_rtc_time,
        .progress               = rtas_progress,
        .get_boot_time          = rtas_get_boot_time,
-       .calibrate_decr         = generic_calibrate_decr,
 #ifdef CONFIG_PCI
        .phys_mem_access_prot   = pci_phys_mem_access_prot,
 #endif

diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 7ea9b6c..0fd67b3 100644 (file)
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -189,5 +189,4 @@ define_machine(lite5200) {
        .init_IRQ       = mpc52xx_init_irq,
        .get_irq        = mpc52xx_get_irq,
        .restart        = mpc52xx_restart,
-       .calibrate_decr = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index a9c92c6..19626cd 100644 (file)
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -236,5 +236,4 @@ define_machine(media5200_platform) {
        .init_IRQ       = media5200_init_irq,
        .get_irq        = mpc52xx_get_irq,
        .restart        = mpc52xx_restart,
-       .calibrate_decr = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index cc349d5..f1e85e8 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -76,5 +76,4 @@ define_machine(mpc5200_simple_platform) {
        .init_IRQ       = mpc52xx_init_irq,
        .get_irq        = mpc52xx_get_irq,
        .restart        = mpc52xx_restart,
-       .calibrate_decr = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index 66defda..8f1856b 100644 (file)
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -308,7 +308,6 @@ define_machine(ep8248e)
        .setup_arch = ep8248e_setup_arch,
        .init_IRQ = ep8248e_pic_init,
        .get_irq = cpm2_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .restart = pq2_restart,
        .progress = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/82xx/km82xx.c b/arch/powerpc/platforms/82xx/km82xx.c
index 8ab575d..51c9bfd 100644 (file)
--- a/arch/powerpc/platforms/82xx/km82xx.c
+++ b/arch/powerpc/platforms/82xx/km82xx.c
@@ -195,7 +195,6 @@ define_machine(km82xx)
        .setup_arch = km82xx_setup_arch,
        .init_IRQ = km82xx_pic_init,
        .get_irq = cpm2_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .restart = pq2_restart,
        .progress = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c
index 5dd034e..f9b2b16 100644 (file)
--- a/arch/powerpc/platforms/82xx/mpc8272_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc8272_ads.c
@@ -199,7 +199,6 @@ define_machine(mpc8272_ads)
        .discover_phbs = pq2_init_pci,
        .init_IRQ = mpc8272_ads_pic_init,
        .get_irq = cpm2_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .restart = pq2_restart,
        .progress = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/82xx/pq2fads.c b/arch/powerpc/platforms/82xx/pq2fads.c
index d91dfdc..4080cb4 100644 (file)
--- a/arch/powerpc/platforms/82xx/pq2fads.c
+++ b/arch/powerpc/platforms/82xx/pq2fads.c
@@ -177,7 +177,6 @@ define_machine(pq2fads)
        .discover_phbs = pq2_init_pci,
        .init_IRQ = pq2fads_pic_init,
        .get_irq = cpm2_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .restart = pq2_restart,
        .progress = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/asp834x.c b/arch/powerpc/platforms/83xx/asp834x.c
index 8f3d995..6870d0c 100644 (file)
--- a/arch/powerpc/platforms/83xx/asp834x.c
+++ b/arch/powerpc/platforms/83xx/asp834x.c
@@ -41,6 +41,5 @@ define_machine(asp834x) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c
index 907acde..26ddc71 100644 (file)
--- a/arch/powerpc/platforms/83xx/km83xx.c
+++ b/arch/powerpc/platforms/83xx/km83xx.c
@@ -184,6 +184,5 @@ define_machine(mpc83xx_km) {
        .get_irq        = ipic_get_irq,
        .restart        = mpc83xx_restart,
        .time_init      = mpc83xx_time_init,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc830x_rdb.c b/arch/powerpc/platforms/83xx/mpc830x_rdb.c
index 956d438..534bb22 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc830x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc830x_rdb.c
@@ -53,6 +53,5 @@ define_machine(mpc830x_rdb) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
index 3b578f0..7b901ab 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
@@ -53,6 +53,5 @@ define_machine(mpc831x_rdb) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 01035ef..c08f043 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -97,6 +97,5 @@ define_machine(mpc832x_mds) {
        .get_irq        = ipic_get_irq,
        .restart        = mpc83xx_restart,
        .time_init      = mpc83xx_time_init,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index 6b7b852..af6774f 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -221,6 +221,5 @@ define_machine(mpc832x_rdb) {
        .get_irq        = ipic_get_irq,
        .restart        = mpc83xx_restart,
        .time_init      = mpc83xx_time_init,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index 92ff7be..e45b98f 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -66,6 +66,5 @@ define_machine(mpc834x_itx) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 8e45c03..d08974a 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -88,6 +88,5 @@ define_machine(mpc834x_mds) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index 4ae2b6e..84c08fd 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -197,6 +197,5 @@ define_machine(mpc836x_mds) {
        .get_irq        = ipic_get_irq,
        .restart        = mpc83xx_restart,
        .time_init      = mpc83xx_time_init,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc836x_rdk.c b/arch/powerpc/platforms/83xx/mpc836x_rdk.c
index 231a5df..1fc9d12 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc836x_rdk.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_rdk.c
@@ -37,6 +37,5 @@ define_machine(mpc836x_rdk) {
        .get_irq        = ipic_get_irq,
        .restart        = mpc83xx_restart,
        .time_init      = mpc83xx_time_init,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c
index 0c10100..c2055ef 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc837x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c
@@ -90,6 +90,5 @@ define_machine(mpc837x_mds) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
index 5d48c68..39e7801 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
@@ -78,6 +78,5 @@ define_machine(mpc837x_rdb) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/bsc913x_qds.c b/arch/powerpc/platforms/85xx/bsc913x_qds.c
index 902a867..a029aa0 100644 (file)
--- a/arch/powerpc/platforms/85xx/bsc913x_qds.c
+++ b/arch/powerpc/platforms/85xx/bsc913x_qds.c
@@ -59,6 +59,5 @@ define_machine(bsc9132_qds) {
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/bsc913x_rdb.c b/arch/powerpc/platforms/85xx/bsc913x_rdb.c
index 58a4495..361b437 100644 (file)
--- a/arch/powerpc/platforms/85xx/bsc913x_rdb.c
+++ b/arch/powerpc/platforms/85xx/bsc913x_rdb.c
@@ -46,6 +46,5 @@ define_machine(bsc9131_rdb) {
        .setup_arch             = bsc913x_rdb_setup_arch,
        .init_IRQ               = bsc913x_rdb_pic_init,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/c293pcie.c b/arch/powerpc/platforms/85xx/c293pcie.c
index fbf1875..3497570 100644 (file)
--- a/arch/powerpc/platforms/85xx/c293pcie.c
+++ b/arch/powerpc/platforms/85xx/c293pcie.c
@@ -51,6 +51,5 @@ define_machine(c293_pcie) {
        .setup_arch             = c293_pcie_setup_arch,
        .init_IRQ               = c293_pcie_pic_init,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
index 2c539de..bfde391 100644 (file)
--- a/arch/powerpc/platforms/85xx/corenet_generic.c
+++ b/arch/powerpc/platforms/85xx/corenet_generic.c
@@ -198,7 +198,6 @@ define_machine(corenet_generic) {
 #else
        .get_irq                = mpic_get_coreint_irq,
 #endif
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
        .power_save             = e500_idle,
 };

diff --git a/arch/powerpc/platforms/85xx/ge_imp3a.c b/arch/powerpc/platforms/85xx/ge_imp3a.c
index 1bfd4ea..3678a1f 100644 (file)
--- a/arch/powerpc/platforms/85xx/ge_imp3a.c
+++ b/arch/powerpc/platforms/85xx/ge_imp3a.c
@@ -203,6 +203,5 @@ define_machine(ge_imp3a) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c
index 548d478..af38c3a 100644 (file)
--- a/arch/powerpc/platforms/85xx/ksi8560.c
+++ b/arch/powerpc/platforms/85xx/ksi8560.c
@@ -180,5 +180,4 @@ define_machine(ksi8560) {
        .show_cpuinfo           = ksi8560_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .restart                = machine_restart,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/platforms/85xx/mpc8536_ds.c
index 9900cf2..58ab383 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc8536_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc8536_ds.c
@@ -62,6 +62,5 @@ define_machine(mpc8536_ds) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index dd5302a..7c67438 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -158,6 +158,5 @@ define_machine(mpc85xx_ads) {
        .init_IRQ               = mpc85xx_ads_pic_init,
        .show_cpuinfo           = mpc85xx_ads_show_cpuinfo,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index d7568b3..0e6964c 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -383,6 +383,5 @@ define_machine(mpc85xx_cds) {
        .pcibios_fixup_bus      = mpc85xx_cds_fixup_bus,
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index b4feb25..70167b8 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -172,7 +172,6 @@ define_machine(mpc8544_ds) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -186,7 +185,6 @@ define_machine(mpc8572_ds) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -200,6 +198,5 @@ define_machine(p2020_ds) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 721322e..28a0492 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -345,7 +345,6 @@ define_machine(mpc8568_mds) {
        .setup_arch     = mpc85xx_mds_setup_arch,
        .init_IRQ       = mpc85xx_mds_pic_init,
        .get_irq        = mpic_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
@@ -359,7 +358,6 @@ define_machine(mpc8569_mds) {
        .setup_arch     = mpc85xx_mds_setup_arch,
        .init_IRQ       = mpc85xx_mds_pic_init,
        .get_irq        = mpic_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
@@ -373,7 +371,6 @@ define_machine(p1021_mds) {
        .setup_arch     = mpc85xx_mds_setup_arch,
        .init_IRQ       = mpc85xx_mds_pic_init,
        .get_irq        = mpic_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
index 9754fea..aa24793 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
@@ -129,7 +129,6 @@ define_machine(p2020_rdb) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -143,7 +142,6 @@ define_machine(p1020_rdb) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -157,7 +155,6 @@ define_machine(p1021_rdb_pc) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -171,7 +168,6 @@ define_machine(p2020_rdb_pc) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -185,7 +181,6 @@ define_machine(p1025_rdb) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -199,7 +194,6 @@ define_machine(p1020_mbg_pc) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -213,7 +207,6 @@ define_machine(p1020_utm_pc) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -227,7 +220,6 @@ define_machine(p1020_rdb_pc) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -241,7 +233,6 @@ define_machine(p1020_rdb_pd) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -255,6 +246,5 @@ define_machine(p1024_rdb) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/mvme2500.c b/arch/powerpc/platforms/85xx/mvme2500.c
index ee1383e..1b59e45 100644 (file)
--- a/arch/powerpc/platforms/85xx/mvme2500.c
+++ b/arch/powerpc/platforms/85xx/mvme2500.c
@@ -53,6 +53,5 @@ define_machine(mvme2500) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/p1010rdb.c b/arch/powerpc/platforms/85xx/p1010rdb.c
index 8ba9306..14ec79a 100644 (file)
--- a/arch/powerpc/platforms/85xx/p1010rdb.c
+++ b/arch/powerpc/platforms/85xx/p1010rdb.c
@@ -73,6 +73,5 @@ define_machine(p1010_rdb) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 15a684c..23d0926 100644 (file)
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -559,6 +559,5 @@ define_machine(p1022_ds) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/p1022_rdk.c b/arch/powerpc/platforms/85xx/p1022_rdk.c
index aee9ffc..d115915 100644 (file)
--- a/arch/powerpc/platforms/85xx/p1022_rdk.c
+++ b/arch/powerpc/platforms/85xx/p1022_rdk.c
@@ -139,6 +139,5 @@ define_machine(p1022_rdk) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/p1023_rdb.c b/arch/powerpc/platforms/85xx/p1023_rdb.c
index e199fc4..9df0439 100644 (file)
--- a/arch/powerpc/platforms/85xx/p1023_rdb.c
+++ b/arch/powerpc/platforms/85xx/p1023_rdb.c
@@ -100,7 +100,6 @@ define_machine(p1023_rdb) {
        .setup_arch             = p1023_rdb_setup_arch,
        .init_IRQ               = p1023_rdb_pic_init,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/85xx/ppa8548.c b/arch/powerpc/platforms/85xx/ppa8548.c
index b030d0e..acd19c5 100644 (file)
--- a/arch/powerpc/platforms/85xx/ppa8548.c
+++ b/arch/powerpc/platforms/85xx/ppa8548.c
@@ -79,6 +79,5 @@ define_machine(ppa8548) {
        .init_IRQ       = ppa8548_pic_init,
        .show_cpuinfo   = ppa8548_show_cpuinfo,
        .get_irq        = mpic_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/qemu_e500.c b/arch/powerpc/platforms/85xx/qemu_e500.c
index 335815a..6e4b1dd 100644 (file)
--- a/arch/powerpc/platforms/85xx/qemu_e500.c
+++ b/arch/powerpc/platforms/85xx/qemu_e500.c
@@ -58,7 +58,6 @@ define_machine(qemu_e500) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_coreint_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
        .power_save             = e500_idle,
 };

diff --git a/arch/powerpc/platforms/85xx/socrates.c b/arch/powerpc/platforms/85xx/socrates.c
index f603a39..9fa1338 100644 (file)
--- a/arch/powerpc/platforms/85xx/socrates.c
+++ b/arch/powerpc/platforms/85xx/socrates.c
@@ -75,6 +75,5 @@ define_machine(socrates) {
        .setup_arch             = socrates_setup_arch,
        .init_IRQ               = socrates_pic_init,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c
index 9f37b25..5e2646b 100644 (file)
--- a/arch/powerpc/platforms/85xx/stx_gp3.c
+++ b/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -90,6 +90,5 @@ define_machine(stx_gp3) {
        .init_IRQ               = stx_gp3_pic_init,
        .show_cpuinfo           = stx_gp3_show_cpuinfo,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index d187f4b..80effb0 100644 (file)
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -127,6 +127,5 @@ define_machine(tqm85xx) {
        .init_IRQ               = tqm85xx_pic_init,
        .show_cpuinfo           = tqm85xx_show_cpuinfo,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c
index 34b1e9c..b88e23a 100644 (file)
--- a/arch/powerpc/platforms/85xx/twr_p102x.c
+++ b/arch/powerpc/platforms/85xx/twr_p102x.c
@@ -112,6 +112,5 @@ define_machine(twr_p1025) {
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/xes_mpc85xx.c b/arch/powerpc/platforms/85xx/xes_mpc85xx.c
index 57c38a8..184013e 100644 (file)
--- a/arch/powerpc/platforms/85xx/xes_mpc85xx.c
+++ b/arch/powerpc/platforms/85xx/xes_mpc85xx.c
@@ -146,7 +146,6 @@ define_machine(xes_mpc8572) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -160,7 +159,6 @@ define_machine(xes_mpc8548) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -174,6 +172,5 @@ define_machine(xes_mpc8540) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/86xx/gef_ppc9a.c b/arch/powerpc/platforms/86xx/gef_ppc9a.c
index 2b656a7..f0512e5 100644 (file)
--- a/arch/powerpc/platforms/86xx/gef_ppc9a.c
+++ b/arch/powerpc/platforms/86xx/gef_ppc9a.c
@@ -185,7 +185,6 @@ define_machine(gef_ppc9a) {
        .show_cpuinfo           = gef_ppc9a_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .time_init              = mpc86xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/86xx/gef_sbc310.c b/arch/powerpc/platforms/86xx/gef_sbc310.c
index f38ab6b..1430b52 100644 (file)
--- a/arch/powerpc/platforms/86xx/gef_sbc310.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc310.c
@@ -172,7 +172,6 @@ define_machine(gef_sbc310) {
        .show_cpuinfo           = gef_sbc310_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .time_init              = mpc86xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c
index 09d59f9..c92af0d 100644 (file)
--- a/arch/powerpc/platforms/86xx/gef_sbc610.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc610.c
@@ -162,7 +162,6 @@ define_machine(gef_sbc610) {
        .show_cpuinfo           = gef_sbc610_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .time_init              = mpc86xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 22ec5d7..6a40370 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -314,7 +314,6 @@ define_machine(mpc86xx_hpcd) {
        .init_IRQ               = mpc86xx_init_irq,
        .get_irq                = mpic_get_irq,
        .time_init              = mpc86xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 61eccb2..7b00ebd 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -107,7 +107,6 @@ define_machine(mpc86xx_hpcn) {
        .show_cpuinfo           = mpc86xx_hpcn_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .time_init              = mpc86xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/86xx/mvme7100.c b/arch/powerpc/platforms/86xx/mvme7100.c
index b2cc32a..c0ac405 100644 (file)
--- a/arch/powerpc/platforms/86xx/mvme7100.c
+++ b/arch/powerpc/platforms/86xx/mvme7100.c
@@ -108,7 +108,6 @@ define_machine(mvme7100) {
        .init_IRQ               = mpc86xx_init_irq,
        .get_irq                = mpic_get_irq,
        .time_init              = mpc86xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/8xx/adder875.c b/arch/powerpc/platforms/8xx/adder875.c
index 68bb0da..7e83eb6 100644 (file)
--- a/arch/powerpc/platforms/8xx/adder875.c
+++ b/arch/powerpc/platforms/8xx/adder875.c
@@ -102,6 +102,5 @@ define_machine(adder875) {
        .init_IRQ = mpc8xx_pic_init,
        .get_irq = mpc8xx_get_irq,
        .restart = mpc8xx_restart,
-       .calibrate_decr = generic_calibrate_decr,
        .progress = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c
index ba3b4a5..6c6e714 100644 (file)
--- a/arch/powerpc/platforms/amigaone/setup.c
+++ b/arch/powerpc/platforms/amigaone/setup.c
@@ -164,6 +164,5 @@ define_machine(amigaone) {
        .show_cpuinfo           = amigaone_show_cpuinfo,
        .init_IRQ               = amigaone_init_IRQ,
        .restart                = amigaone_restart,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 47eaf75..9e07d10 100644 (file)
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -265,7 +265,6 @@ define_machine(cell) {
        .get_boot_time          = rtas_get_boot_time,
        .get_rtc_time           = rtas_get_rtc_time,
        .set_rtc_time           = rtas_set_rtc_time,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = cell_progress,
        .init_IRQ               = cell_init_irq,
        .pci_setup_phb          = cell_setup_phb,

diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index d9049ce..36ee3a5 100644 (file)
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -582,6 +582,5 @@ define_machine(chrp) {
        .time_init              = chrp_time_init,
        .set_rtc_time           = chrp_set_rtc_time,
        .get_rtc_time           = chrp_get_rtc_time,
-       .calibrate_decr         = generic_calibrate_decr,
        .phys_mem_access_prot   = pci_phys_mem_access_prot,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/gamecube.c b/arch/powerpc/platforms/embedded6xx/gamecube.c
index 60cdc28..e3b2c74 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/gamecube.c
+++ b/arch/powerpc/platforms/embedded6xx/gamecube.c
@@ -70,7 +70,6 @@ define_machine(gamecube) {
        .halt                   = gamecube_halt,
        .init_IRQ               = flipper_pic_probe,
        .get_irq                = flipper_pic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
        .machine_shutdown       = gamecube_shutdown,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c
index 67949c8..a167ee8 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/arch/powerpc/platforms/embedded6xx/holly.c
@@ -264,7 +264,6 @@ define_machine(holly){
        .show_cpuinfo                   = holly_show_cpuinfo,
        .get_irq                        = mpic_get_irq,
        .restart                        = holly_restart,
-       .calibrate_decr                 = generic_calibrate_decr,
        .machine_check_exception        = ppc750_machine_check_exception,
        .progress                       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index f04fd23..9c10aac 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -159,5 +159,4 @@ define_machine(linkstation){
        .get_irq                = mpic_get_irq,
        .restart                = linkstation_restart,
        .halt                   = linkstation_halt,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index 6821fb6..ec93d69 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -182,7 +182,6 @@ define_machine(mpc7448_hpc2){
        .show_cpuinfo           = mpc7448_hpc2_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .restart                = mpc7448_hpc2_restart,
-       .calibrate_decr         = generic_calibrate_decr,
        .machine_check_exception= mpc7448_machine_check_exception,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/mvme5100.c b/arch/powerpc/platforms/embedded6xx/mvme5100.c
index 7e57de5..00bec0f 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/mvme5100.c
+++ b/arch/powerpc/platforms/embedded6xx/mvme5100.c
@@ -204,6 +204,5 @@ define_machine(mvme5100) {
        .show_cpuinfo           = mvme5100_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .restart                = mvme5100_restart,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c
index ab85af3..e49880e 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/storcenter.c
+++ b/arch/powerpc/platforms/embedded6xx/storcenter.c
@@ -118,5 +118,4 @@ define_machine(storcenter){
        .init_IRQ               = storcenter_init_IRQ,
        .get_irq                = mpic_get_irq,
        .restart                = storcenter_restart,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index 635c393..b54382a 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -175,7 +175,6 @@ define_machine(wii) {
        .halt                   = wii_halt,
        .init_IRQ               = wii_pic_probe,
        .get_irq                = flipper_pic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
        .machine_shutdown       = wii_shutdown,
 };

diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index 98c8e36..4061851 100644 (file)
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -357,7 +357,6 @@ define_machine(maple) {
        .get_boot_time          = maple_get_boot_time,
        .set_rtc_time           = maple_set_rtc_time,
        .get_rtc_time           = maple_get_rtc_time,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = maple_progress,
        .power_save             = power4_idle,
 };

diff --git a/arch/powerpc/platforms/microwatt/setup.c b/arch/powerpc/platforms/microwatt/setup.c
index f08edcd..5e1c099 100644 (file)
--- a/arch/powerpc/platforms/microwatt/setup.c
+++ b/arch/powerpc/platforms/microwatt/setup.c
@@ -40,5 +40,4 @@ define_machine(microwatt) {
        .init_IRQ               = microwatt_init_IRQ,
        .setup_arch             = microwatt_setup_arch,
        .progress               = udbg_progress,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index 2aef49e..5c5b4a0 100644 (file)
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -449,7 +449,6 @@ define_machine(pasemi) {
        .get_irq                = mpic_get_irq,
        .restart                = pas_restart,
        .get_boot_time          = pas_get_boot_time,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = pas_progress,
        .machine_check_exception = pas_machine_check_handler,
 };

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index f897316..5e9c6b5 100644 (file)
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -585,7 +585,6 @@ define_machine(powernv) {
        .progress               = pnv_progress,
        .machine_shutdown       = pnv_shutdown,
        .power_save             = NULL,
-       .calibrate_decr         = generic_calibrate_decr,
        .machine_check_early    = pnv_machine_check_early,
 #ifdef CONFIG_KEXEC_CORE
        .kexec_cpu_down         = pnv_kexec_cpu_down,

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 94a7617..e2a57cf 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -1138,7 +1138,6 @@ define_machine(pseries) {
        .get_boot_time          = rtas_get_boot_time,
        .get_rtc_time           = rtas_get_rtc_time,
        .set_rtc_time           = rtas_set_rtc_time,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = rtas_progress,
        .system_reset_exception = pSeries_system_reset_exception,
        .machine_check_early    = pseries_machine_check_realmode,