Move SUB_PER_DRIVE definition into minix/drvlib.h

Change-Id: Id25761085ce1868955da34d8e530e170448ea154

drivers/ahci/ahci.h

@@ -264,7 +264,6 @@ typedef struct vumap_phys prd_t;
  */
 #define MAX_DRIVES		8
 #define NR_MINORS		(MAX_DRIVES * DEV_PER_DRIVE)
-#define SUB_PER_DRIVE		(NR_PARTITIONS * NR_PARTITIONS)
 #define NR_SUBDEVS		(MAX_DRIVES * SUB_PER_DRIVE)
 
 /* Port states. */

drivers/at_wini/at_wini.h

@@ -194,7 +194,6 @@
 #define MAX_SECS	 256	/* controller can transfer this many sectors */
 #define MAX_ERRORS         4	/* how often to try rd/wt before quitting */
 #define NR_MINORS       (MAX_DRIVES * DEV_PER_DRIVE)
-#define SUB_PER_DRIVE	(NR_PARTITIONS * NR_PARTITIONS)
 #define NR_SUBDEVS	(MAX_DRIVES * SUB_PER_DRIVE)
 #define DELAY_USECS     1000	/* controller timeout in microseconds */
 #define DELAY_TICKS 	   1	/* controller timeout in ticks */

drivers/mmc/mmcblk.c

@@ -32,7 +32,6 @@ static struct log log = {
 /* holding the current host controller */
 static struct mmc_host host;
 
-#define SUB_PER_DRIVE           (NR_PARTITIONS * NR_PARTITIONS)
 #define NR_SUBDEVS              (MAX_DRIVES * SUB_PER_DRIVE)
 
 /* When passing data over a grant one needs to pass

drivers/virtio_blk/virtio_blk.c

@@ -60,9 +60,8 @@ static int terminating = 0;
 static int open_count = 0;
 
 /* Partition magic */
-#define VIRTIO_BLK_SUB_PER_DRIVE	(NR_PARTITIONS * NR_PARTITIONS)
 struct device part[DEV_PER_DRIVE];
-struct device subpart[VIRTIO_BLK_SUB_PER_DRIVE];
+struct device subpart[SUB_PER_DRIVE];
 
 /* Headers for requests */
 static struct virtio_blk_outhdr *hdrs_vir;

include/minix/drvlib.h

@@ -8,6 +8,7 @@ void partition(struct blockdriver *bdr, int device, int style, int
 	atapi);
 
 #define DEV_PER_DRIVE	(1 + NR_PARTITIONS)
+#define SUB_PER_DRIVE	(NR_PARTITIONS * NR_PARTITIONS)
 #define MINOR_t0	64
 #define MINOR_r0	120
 #define MINOR_d0p0s0	128