[PATCH] dev_t [3/3]: major.h cleanups

Patch from Andries.Brouwer@cwi.nl

The third patch removes the last occurrences of MAX_BLKDEV and MAX_CHRDEV and
sorts the majors in major.h.  It also updates the definition of
SCSI_DISK_MAJOR.

include/linux/major.h

@@ -6,23 +6,14 @@
  * For the device number assignments, see Documentation/devices.txt.
  */
 
-/* limits */
-
-/*
- * Important: Don't change this to 256.  Major number 255 is and must be
- * reserved for future expansion into a larger dev_t space.
- */
-#define MAX_CHRDEV	255
-#define MAX_BLKDEV	255
-
 #define UNNAMED_MAJOR		0
 #define MEM_MAJOR		1
 #define RAMDISK_MAJOR		1
 #define FLOPPY_MAJOR		2
 #define PTY_MASTER_MAJOR	2
 #define IDE0_MAJOR		3
-#define PTY_SLAVE_MAJOR 3
 #define HD_MAJOR		IDE0_MAJOR
+#define PTY_SLAVE_MAJOR		3
 #define TTY_MAJOR		4
 #define TTYAUX_MAJOR		5
 #define LP_MAJOR		6
@@ -47,10 +38,9 @@
 #define MITSUMI_X_CDROM_MAJOR	20
 #define MFM_ACORN_MAJOR		21	/* ARM Linux /dev/mfm */
 #define SCSI_GENERIC_MAJOR	21
-#define Z8530_MAJOR 34
-#define DIGI_MAJOR 23
 #define IDE1_MAJOR		22
 #define DIGICU_MAJOR		22
+#define DIGI_MAJOR		23
 #define MITSUMI_CDROM_MAJOR	23
 #define CDU535_CDROM_MAJOR	24
 #define STL_SERIALMAJOR		24
@@ -64,12 +54,11 @@
 #define ACSI_MAJOR		28
 #define AZTECH_CDROM_MAJOR	29
 #define GRAPHDEV_MAJOR		29   /* SparcLinux & Linux/68k /dev/fb */
-#define SHMIQ_MAJOR	85	/* Linux/mips, SGI /dev/shmiq */
 #define CM206_CDROM_MAJOR	32
 #define IDE2_MAJOR		33
 #define IDE3_MAJOR		34
-#define XPRAM_MAJOR     35      /* expanded storage on S/390 = "slow ram" */
-                                /* proposed by Peter                      */
+#define Z8530_MAJOR		34
+#define XPRAM_MAJOR		35   /* Expanded storage on S/390: "slow ram"*/
 #define NETLINK_MAJOR		36
 #define PS2ESDI_MAJOR		36
 #define IDETAPE_MAJOR		37
@@ -94,15 +83,6 @@
 #define SCSI_DISK6_MAJOR	70
 #define SCSI_DISK7_MAJOR	71
 
-#define SCSI_DISK8_MAJOR	128
-#define SCSI_DISK9_MAJOR	129
-#define SCSI_DISK10_MAJOR	130
-#define SCSI_DISK11_MAJOR	131
-#define SCSI_DISK12_MAJOR	132
-#define SCSI_DISK13_MAJOR	133
-#define SCSI_DISK14_MAJOR	134
-#define SCSI_DISK15_MAJOR	135
-
 #define COMPAQ_SMART2_MAJOR	72
 #define COMPAQ_SMART2_MAJOR1	73
 #define COMPAQ_SMART2_MAJOR2	74
@@ -115,36 +95,51 @@
 #define SPECIALIX_NORMAL_MAJOR	75
 #define SPECIALIX_CALLOUT_MAJOR	76
 
-#define COMPAQ_CISS_MAJOR 	104
-#define COMPAQ_CISS_MAJOR1	105
-#define COMPAQ_CISS_MAJOR2      106
-#define COMPAQ_CISS_MAJOR3      107
-#define COMPAQ_CISS_MAJOR4      108
-#define COMPAQ_CISS_MAJOR5      109
-#define COMPAQ_CISS_MAJOR6      110
-#define COMPAQ_CISS_MAJOR7      111
-
-#define ATARAID_MAJOR		114
-
-#define DASD_MAJOR      94	/* Official assignations from Peter */
-
-#define MDISK_MAJOR     95	/* Official assignations from Peter */
+#define AURORA_MAJOR		79
 
 #define I2O_MAJOR		80	/* 80->87 */
 
+#define SHMIQ_MAJOR		85   /* Linux/mips, SGI /dev/shmiq */
+
 #define IDE6_MAJOR		88
 #define IDE7_MAJOR		89
 #define IDE8_MAJOR		90
 #define IDE9_MAJOR		91
 
-#define UBD_MAJOR	98
+#define DASD_MAJOR		94
 
-#define AURORA_MAJOR 79
+#define MDISK_MAJOR		95
+
+#define UBD_MAJOR		98
 
 #define JSFD_MAJOR		99
 
 #define PHONE_MAJOR		100
 
+#define COMPAQ_CISS_MAJOR	104
+#define COMPAQ_CISS_MAJOR1	105
+#define COMPAQ_CISS_MAJOR2      106
+#define COMPAQ_CISS_MAJOR3      107
+#define COMPAQ_CISS_MAJOR4      108
+#define COMPAQ_CISS_MAJOR5      109
+#define COMPAQ_CISS_MAJOR6      110
+#define COMPAQ_CISS_MAJOR7      111
+
+#define ATARAID_MAJOR		114
+
+#define SCSI_DISK8_MAJOR	128
+#define SCSI_DISK9_MAJOR	129
+#define SCSI_DISK10_MAJOR	130
+#define SCSI_DISK11_MAJOR	131
+#define SCSI_DISK12_MAJOR	132
+#define SCSI_DISK13_MAJOR	133
+#define SCSI_DISK14_MAJOR	134
+#define SCSI_DISK15_MAJOR	135
+
+#define UNIX98_PTY_MASTER_MAJOR	128
+#define UNIX98_PTY_MAJOR_COUNT	8
+#define UNIX98_PTY_SLAVE_MAJOR	(UNIX98_PTY_MASTER_MAJOR+UNIX98_PTY_MAJOR_COUNT)
+
 #define RTF_MAJOR		150
 #define RAW_MAJOR		162
 
@@ -152,10 +147,6 @@
 #define USB_ACM_AUX_MAJOR	167
 #define USB_CHAR_MAJOR		180
 
-#define UNIX98_PTY_MASTER_MAJOR	128
-#define UNIX98_PTY_MAJOR_COUNT	8
-#define UNIX98_PTY_SLAVE_MAJOR	(UNIX98_PTY_MASTER_MAJOR+UNIX98_PTY_MAJOR_COUNT)
-
 #define VXVM_MAJOR		199	/* VERITAS volume i/o driver    */
 #define VXSPEC_MAJOR		200	/* VERITAS volume config driver */
 #define VXDMP_MAJOR		201	/* VERITAS volume multipath driver */
@@ -165,7 +156,7 @@
 
 #define OSST_MAJOR		206	/* OnStream-SCx0 SCSI tape */
 
-#define IBM_TTY3270_MAJOR       227	/* Official allocations now */
+#define IBM_TTY3270_MAJOR	227
 #define IBM_FS3270_MAJOR	228
 
 /*
@@ -173,7 +164,8 @@
  */
 
 #define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
-  ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR))
+  ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR) || \
+  ((M) >= SCSI_DISK8_MAJOR && (M) <= SCSI_DISK15_MAJOR))
   
 #define SCSI_BLK_MAJOR(M) \
   (SCSI_DISK_MAJOR(M)	\