init: remove pointless Root_* values

Remove all unused defines, and just use the expanded versions for
the SCSI disk majors.

I've decided to keep Root_RAM0 even if it could be expanded as there
is a lot of special casing for it in the init code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230531125535.676098-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index 33bf3a62700270ac732f3b537c0992515041f946..b650ff1cb022eee9865c2890e223067de8e9a309 100644 (file)
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -658,7 +658,7 @@ setup_arch(char **cmdline_p)
 #endif
 
        /* Default root filesystem to sda2.  */
-       ROOT_DEV = Root_SDA2;
+       ROOT_DEV = MKDEV(SCSI_DISK0_MAJOR, 2);
 
 #ifdef CONFIG_EISA
        /* FIXME:  only set this when we actually have EISA in this box? */

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index c0572804427275e7837c8b6524411f16e453fafc..becdb4f33c21958fc63186b1412c1dda69e2ab79 100644 (file)
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -627,7 +627,7 @@ setup_arch (char **cmdline_p)
         * is physical disk 1 partition 1 and the Linux root disk is
         * physical disk 1 partition 2.
         */
-       ROOT_DEV = Root_SDA2;           /* default to second partition on first drive */
+       ROOT_DEV = MKDEV(SCSI_DISK0_MAJOR, 2);
 
        if (is_uv_system())
                uv_setup(cmdline_p);

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 193cc9c394221b09b399a57e45a6622365992b25..0c41f4b005bcf329965f62f4e77ec3b50f60b7d1 100644 (file)
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -76,7 +76,8 @@ int pmac_newworld;
 
 static int current_root_goodness = -1;
 
-#define DEFAULT_ROOT_DEVICE Root_SDA1  /* sda1 - slightly silly choice */
+/* sda1 - slightly silly choice */
+#define DEFAULT_ROOT_DEVICE    MKDEV(SCSI_DISK0_MAJOR, 1)
 
 sys_ctrler_t sys_ctrler = SYS_CTRLER_UNKNOWN;
 EXPORT_SYMBOL(sys_ctrler);

diff --git a/include/linux/root_dev.h b/include/linux/root_dev.h
index 4e78651371ba9225babe162ea488f814562829dc..ed3ea8da642972857a8df88a69369133e72e5d46 100644 (file)
--- a/include/linux/root_dev.h
+++ b/include/linux/root_dev.h
@@ -10,14 +10,6 @@ enum {
        Root_NFS = MKDEV(UNNAMED_MAJOR, 255),
        Root_CIFS = MKDEV(UNNAMED_MAJOR, 254),
        Root_RAM0 = MKDEV(RAMDISK_MAJOR, 0),
-       Root_RAM1 = MKDEV(RAMDISK_MAJOR, 1),
-       Root_FD0 = MKDEV(FLOPPY_MAJOR, 0),
-       Root_HDA1 = MKDEV(IDE0_MAJOR, 1),
-       Root_HDA2 = MKDEV(IDE0_MAJOR, 2),
-       Root_SDA1 = MKDEV(SCSI_DISK0_MAJOR, 1),
-       Root_SDA2 = MKDEV(SCSI_DISK0_MAJOR, 2),
-       Root_HDC1 = MKDEV(IDE1_MAJOR, 1),
-       Root_SR0 = MKDEV(SCSI_CDROM_MAJOR, 0),
 };
 
 extern dev_t ROOT_DEV;