[POWERPC] Platforms shouldn't mess with ROOT_DEV

There is no good reason for board platform code to mess with the
ROOT_DEV.  Remove it from all in-tree platforms except powermac.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>

5 files changed, 0 insertions, 34 deletions

diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index 4263158b3274..0b1e60a010ba 100644
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -197,15 +197,6 @@ static void __init efika_setup_arch(void)
 {
         rtas_initialize();
 
-#ifdef CONFIG_BLK_DEV_INITRD
-        initrd_below_start_ok = 1;
-
-        if (initrd_start)
-                ROOT_DEV = Root_RAM0;
-        else
-#endif
-                ROOT_DEV = Root_SDA2;   /* sda2 (sda1 is for the kernel) */
-
         efika_pcisetup();
 
 #ifdef CONFIG_PM
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 5343e3844e2a..98e7ef8e6fc6 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -171,11 +171,6 @@ static void __init cell_setup_arch(void)
         /* init to some ~sane value until calibrate_delay() runs */
         loops_per_jiffy = 50000000;
 
-        if (ROOT_DEV == 0) {
-                printk("No ramdisk, default root is /dev/hda2\n");
-                ROOT_DEV = Root_HDA2;
-        }
-
         /* Find and initialize PCI host bridges */
         init_pci_config_tokens();
         find_and_init_phbs();
diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/celleb/setup.c
index 0f1dddb81cd2..1769d755eff3 100644
--- a/arch/powerpc/platforms/celleb/setup.c
+++ b/arch/powerpc/platforms/celleb/setup.c
@@ -101,11 +101,6 @@ static void __init celleb_setup_arch(void)
         /* init to some ~sane value until calibrate_delay() runs */
         loops_per_jiffy = 50000000;
 
-        if (ROOT_DEV == 0) {
-                printk("No ramdisk, default root is /dev/hda2\n");
-                ROOT_DEV = Root_HDA2;
-        }
-
 #ifdef CONFIG_DUMMY_CONSOLE
         conswitchp = &dummy_con;
 #endif
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 96498ad7b943..59306261f5b2 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -290,16 +290,6 @@ void __init chrp_setup_arch(void)
                 ppc_md.set_rtc_time     = rtas_set_rtc_time;
         }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-        /* this is fine for chrp */
-        initrd_below_start_ok = 1;
-
-        if (initrd_start)
-                ROOT_DEV = Root_RAM0;
-        else
-#endif
-                ROOT_DEV = Root_SDA2; /* sda2 (sda1 is for the kernel) */
-
         /* On pegasos, enable the L2 cache if not already done by OF */
         pegasos_set_l2cr();
 
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index f0b7146a110f..fdb9b1c8f977 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -257,11 +257,6 @@ static void __init pSeries_setup_arch(void)
         /* init to some ~sane value until calibrate_delay() runs */
         loops_per_jiffy = 50000000;
 
-        if (ROOT_DEV == 0) {
-                printk("No ramdisk, default root is /dev/sda2\n");
-                ROOT_DEV = Root_SDA2;
-        }
-
         fwnmi_init();
 
         /* Find and initialize PCI host bridges */