@@ -248,7 +248,6 @@ static dev_t devt_from_devnum(const char *name)
248
248
*
249
249
* 1) <hex_major><hex_minor> device number in hexadecimal represents itself
250
250
* no leading 0x, for example b302.
251
- * 2) /dev/nfs represents Root_NFS (0xff)
252
251
* 3) /dev/<disk_name> represents the device number of disk
253
252
* 4) /dev/<disk_name><decimal> represents the device number
254
253
* of partition - device number of disk plus the partition number
@@ -266,7 +265,6 @@ static dev_t devt_from_devnum(const char *name)
266
265
* a colon.
267
266
* 9) PARTLABEL=<name> with name being the GPT partition label.
268
267
* MSDOS partitions do not support labels!
269
- * 10) /dev/cifs represents Root_CIFS (0xfe)
270
268
*
271
269
* If name doesn't have fall into the categories above, we return (0,0).
272
270
* block_class is used to check if something is a disk name. If the disk
@@ -275,12 +273,6 @@ static dev_t devt_from_devnum(const char *name)
275
273
*/
276
274
dev_t name_to_dev_t (const char * name )
277
275
{
278
- if (strcmp (name , "/dev/nfs" ) == 0 )
279
- return Root_NFS ;
280
- if (strcmp (name , "/dev/cifs" ) == 0 )
281
- return Root_CIFS ;
282
- if (strcmp (name , "/dev/ram" ) == 0 )
283
- return Root_RAM0 ;
284
276
#ifdef CONFIG_BLOCK
285
277
if (strncmp (name , "PARTUUID=" , 9 ) == 0 )
286
278
return devt_from_partuuid (name + 9 );
@@ -631,6 +623,12 @@ static dev_t __init parse_root_device(char *root_device_name)
631
623
if (!strncmp (root_device_name , "mtd" , 3 ) ||
632
624
!strncmp (root_device_name , "ubi" , 3 ))
633
625
return Root_Generic ;
626
+ if (strcmp (root_device_name , "/dev/nfs" ) == 0 )
627
+ return Root_NFS ;
628
+ if (strcmp (root_device_name , "/dev/cifs" ) == 0 )
629
+ return Root_CIFS ;
630
+ if (strcmp (root_device_name , "/dev/ram" ) == 0 )
631
+ return Root_RAM0 ;
634
632
return name_to_dev_t (root_device_name );
635
633
}
636
634
0 commit comments