[PATCH] gendisk for pf.c

pf switched to use of gendisk and cleaned up - we pass pointers to structures
instead of minors now.

drivers/block/paride/pf.c

@@ -139,15 +139,7 @@ static int drive3[7] = { 0, 0, 0, -1, -1, -1, -1 };
 static int (*drives[4])[7] = {&drive0, &drive1, &drive2, &drive3};
 static int pf_drive_count;
 
-#define D_PRT   0
-#define D_PRO   1
-#define D_UNI   2
-#define D_MOD   3
-#define D_SLV   4
-#define D_LUN   5
-#define D_DLY   6
-
-#define DU              (*drives[unit])
+enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_LUN, D_DLY};
 
 /* end of parameters */
 
@@ -256,11 +248,6 @@ static void do_pf_write_start(void);
 static void do_pf_read_drq(void);
 static void do_pf_write_done(void);
 
-static int pf_identify(int unit);
-static void pf_lock(int unit, int func);
-static void pf_eject(int unit);
-static int pf_check_media(kdev_t dev);
-
 #define PF_NM           0
 #define PF_RO           1
 #define PF_RW           2
@@ -275,17 +262,17 @@ struct pf_unit {
 	int drive;		/* drive */
 	int lun;
 	int access;		/* count of active opens ... */
-	int capacity;		/* Size of this volume in sectors */
 	int present;		/* device present ? */
 	char name[PF_NAMELEN];	/* pf0, pf1, ... */
+	struct gendisk disk;
 };
 
-struct pf_unit pf[PF_UNITS];
+struct pf_unit units[PF_UNITS];
 
-/*  'unit' must be defined in all functions - either as a local or a param */
-
-#define PF pf[unit]
-#define PI PF.pi
+static int pf_identify(struct pf_unit *pf);
+static void pf_lock(struct pf_unit *pf, int func);
+static void pf_eject(struct pf_unit *pf);
+static int pf_check_media(kdev_t dev);
 
 static char pf_scratch[512];	/* scratch block buffer */
 
@@ -295,43 +282,44 @@ static char pf_scratch[512];	/* scratch block buffer */
 
 static int pf_retries = 0;	/* i/o error retry count */
 static int pf_busy = 0;		/* request being processed ? */
+static struct request *pf_req;	/* current request */
 static int pf_block;		/* address of next requested block */
 static int pf_count;		/* number of blocks still to do */
 static int pf_run;		/* sectors in current cluster */
 static int pf_cmd;		/* current command READ/WRITE */
-static int pf_unit;		/* unit of current request */
+static struct pf_unit *pf_current;/* unit of current request */
 static int pf_mask;		/* stopper for pseudo-int */
 static char *pf_buf;		/* buffer for request in progress */
 
 /* kernel glue structures */
 
 static struct block_device_operations pf_fops = {
-	owner:THIS_MODULE,
-	open:pf_open,
-	release:pf_release,
-	ioctl:pf_ioctl,
-	check_media_change:pf_check_media,
+	.owner			= THIS_MODULE,
+	.open			= pf_open,
+	.release		= pf_release,
+	.ioctl			= pf_ioctl,
+	.check_media_change	= pf_check_media,
 };
 
 void pf_init_units(void)
 {
-	int unit, j;
+	struct pf_unit *pf;
+	int unit;
 
 	pf_drive_count = 0;
-	for (unit = 0; unit < PF_UNITS; unit++) {
-		PF.pi = &PF.pia;
-		PF.access = 0;
-		PF.media_status = PF_NM;
-		PF.capacity = 0;
-		PF.present = 0;
-		PF.drive = DU[D_SLV];
-		PF.lun = DU[D_LUN];
-		j = 0;
-		while ((j < PF_NAMELEN - 2) && (PF.name[j] = name[j]))
-			j++;
-		PF.name[j++] = '0' + unit;
-		PF.name[j] = 0;
-		if (DU[D_PRT])
+	for (unit = 0, pf = units; unit < PF_UNITS; unit++, pf++) {
+		struct gendisk *disk = &pf->disk;
+		pf->pi = &pf->pia;
+		pf->media_status = PF_NM;
+		pf->drive = (*drives[unit])[D_SLV];
+		pf->lun = (*drives[unit])[D_LUN];
+		snprintf(pf->name, PF_NAMELEN, "%s%d", name, unit);
+		disk->major = MAJOR_NR;
+		disk->first_minor = unit;
+		disk->major_name = pf->name;
+		disk->minor_shift = 0;
+		disk->fops = &pf_fops;
+		if (!(*drives[unit])[D_PRT])
 			pf_drive_count++;
 	}
 }
@@ -339,87 +327,75 @@ void pf_init_units(void)
 static int pf_open(struct inode *inode, struct file *file)
 {
 	int unit = DEVICE_NR(inode->i_rdev);
+	struct pf_unit *pf = units + unit;
 
-	if ((unit >= PF_UNITS) || (!PF.present))
+	if ((unit >= PF_UNITS) || (!pf->present))
 		return -ENODEV;
 
-	pf_identify(unit);
+	pf_identify(pf);
 
-	if (PF.media_status == PF_NM)
+	if (pf->media_status == PF_NM)
 		return -ENODEV;
 
-	if ((PF.media_status == PF_RO) && (file->f_mode & 2))
+	if ((pf->media_status == PF_RO) && (file->f_mode & 2))
 		return -EROFS;
 
-	PF.access++;
-	if (PF.removable)
-		pf_lock(unit, 1);
+	pf->access++;
+	if (pf->removable)
+		pf_lock(pf, 1);
 
 	return 0;
 }
 
 static int pf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
-	int err, unit;
+	int unit = DEVICE_NR(inode->i_rdev);
 	struct hd_geometry *geo = (struct hd_geometry *) arg;
+	struct hd_geometry g;
+	struct pf_unit *pf = units + unit;
+	sector_t capacity;
 
-	if ((!inode) || kdev_none(inode->i_rdev))
-		return -EINVAL;
-	unit = DEVICE_NR(inode->i_rdev);
 	if (unit >= PF_UNITS)
 		return -EINVAL;
-	if (!PF.present)
+	if (!pf->present)
 		return -ENODEV;
 
-	switch (cmd) {
-	case CDROMEJECT:
-		if (PF.access == 1) {
-			pf_eject(unit);
+	if (cmd == CDROMEJECT) {
+		if (pf->access == 1) {
+			pf_eject(pf);
 			return 0;
 		}
-	case HDIO_GETGEO:
-		if (!geo)
+		return -EBUSY;
+	}
+	if (cmd != HDIO_GETGEO)
 		return -EINVAL;
-		err = verify_area(VERIFY_WRITE, geo, sizeof (*geo));
-		if (err)
-			return err;
-		if (PF.capacity < PF_FD_MAX) {
-			put_user(PF.capacity / (PF_FD_HDS * PF_FD_SPT),
-				 (short *) &geo->cylinders);
-			put_user(PF_FD_HDS, (char *) &geo->heads);
-			put_user(PF_FD_SPT, (char *) &geo->sectors);
+	capacity = get_capacity(&pf->disk);
+	if (capacity < PF_FD_MAX) {
+		g.cylinders = capacity / (PF_FD_HDS * PF_FD_SPT);
+		g.heads = PF_FD_HDS;
+		g.sectors = PF_FD_SPT;
 	} else {
-			put_user(PF.capacity / (PF_HD_HDS * PF_HD_SPT),
-				 (short *) &geo->cylinders);
-			put_user(PF_HD_HDS, (char *) &geo->heads);
-			put_user(PF_HD_SPT, (char *) &geo->sectors);
+		g.cylinders = capacity / (PF_HD_HDS * PF_HD_SPT);
+		g.heads = PF_HD_HDS;
+		g.sectors = PF_HD_SPT;
 	}
-		put_user(0, (long *) &geo->start);
+	if (copy_to_user(geo, &g, sizeof(g)))
+		return -EFAULT;
 	return 0;
-	case BLKGETSIZE:
-		return put_user(PF.capacity, (long *) arg);
-	case BLKGETSIZE64:
-		return put_user((u64) PF.capacity << 9, (u64 *) arg);
-	default:
-		return -EINVAL;
-	}
 }
 
 static int pf_release(struct inode *inode, struct file *file)
 {
-	kdev_t devp;
-	int unit;
-
-	devp = inode->i_rdev;
-	unit = DEVICE_NR(devp);
+	int unit = DEVICE_NR(inode->i_rdev);
+	struct pf_unit *pf = units + unit;
 
-	if ((unit >= PF_UNITS) || (PF.access <= 0))
+	if ((unit >= PF_UNITS) || (pf->access <= 0))
 		return -EINVAL;
 
-	PF.access--;
+	pf->access--;
 
-	if (!PF.access && PF.removable)
-		pf_lock(unit, 0);
+	if (!pf->access && pf->removable)
+		pf_lock(pf, 0);
 
 	return 0;
 
@@ -430,145 +406,142 @@ static int pf_check_media(kdev_t dev)
 	return 1;
 }
 
-static inline int status_reg(int unit)
+static inline int status_reg(struct pf_unit *pf)
 {
-	return pi_read_regr(PI, 1, 6);
+	return pi_read_regr(pf->pi, 1, 6);
 }
 
-static inline int read_reg(int unit, int reg)
+static inline int read_reg(struct pf_unit *pf, int reg)
 {
-	return pi_read_regr(PI, 0, reg);
+	return pi_read_regr(pf->pi, 0, reg);
 }
 
-static inline void write_reg(int unit, int reg, int val)
+static inline void write_reg(struct pf_unit *pf, int reg, int val)
 {
-	pi_write_regr(PI, 0, reg, val);
+	pi_write_regr(pf->pi, 0, reg, val);
 }
 
-#define LUN             (0x20*PF.lun)
-#define DRIVE           (0xa0+0x10*PF.drive)
-
-static int pf_wait(int unit, int go, int stop, char *fun, char *msg)
+static int pf_wait(struct pf_unit *pf, int go, int stop, char *fun, char *msg)
 {
 	int j, r, e, s, p;
 
 	j = 0;
-	while ((((r = status_reg(unit)) & go) || (stop && (!(r & stop))))
+	while ((((r = status_reg(pf)) & go) || (stop && (!(r & stop))))
 	       && (j++ < PF_SPIN))
 		udelay(PF_SPIN_DEL);
 
 	if ((r & (STAT_ERR & stop)) || (j >= PF_SPIN)) {
-		s = read_reg(unit, 7);
-		e = read_reg(unit, 1);
-		p = read_reg(unit, 2);
+		s = read_reg(pf, 7);
+		e = read_reg(pf, 1);
+		p = read_reg(pf, 2);
 		if (j >= PF_SPIN)
 			e |= 0x100;
 		if (fun)
 			printk("%s: %s %s: alt=0x%x stat=0x%x err=0x%x"
 			       " loop=%d phase=%d\n",
-			       PF.name, fun, msg, r, s, e, j, p);
+			       pf->name, fun, msg, r, s, e, j, p);
 		return (e << 8) + s;
 	}
 	return 0;
 }
 
-static int pf_command(int unit, char *cmd, int dlen, char *fun)
+static int pf_command(struct pf_unit *pf, char *cmd, int dlen, char *fun)
 {
-	pi_connect(PI);
+	pi_connect(pf->pi);
 
-	write_reg(unit, 6, DRIVE);
+	write_reg(pf, 6, 0xa0+0x10*pf->drive);
 
-	if (pf_wait(unit, STAT_BUSY | STAT_DRQ, 0, fun, "before command")) {
-		pi_disconnect(PI);
+	if (pf_wait(pf, STAT_BUSY | STAT_DRQ, 0, fun, "before command")) {
+		pi_disconnect(pf->pi);
 		return -1;
 	}
 
-	write_reg(unit, 4, dlen % 256);
-	write_reg(unit, 5, dlen / 256);
-	write_reg(unit, 7, 0xa0);	/* ATAPI packet command */
+	write_reg(pf, 4, dlen % 256);
+	write_reg(pf, 5, dlen / 256);
+	write_reg(pf, 7, 0xa0);	/* ATAPI packet command */
 
-	if (pf_wait(unit, STAT_BUSY, STAT_DRQ, fun, "command DRQ")) {
-		pi_disconnect(PI);
+	if (pf_wait(pf, STAT_BUSY, STAT_DRQ, fun, "command DRQ")) {
+		pi_disconnect(pf->pi);
 		return -1;
 	}
 
-	if (read_reg(unit, 2) != 1) {
-		printk("%s: %s: command phase error\n", PF.name, fun);
-		pi_disconnect(PI);
+	if (read_reg(pf, 2) != 1) {
+		printk("%s: %s: command phase error\n", pf->name, fun);
+		pi_disconnect(pf->pi);
 		return -1;
 	}
 
-	pi_write_block(PI, cmd, 12);
+	pi_write_block(pf->pi, cmd, 12);
 
 	return 0;
 }
 
-static int pf_completion(int unit, char *buf, char *fun)
+static int pf_completion(struct pf_unit *pf, char *buf, char *fun)
 {
 	int r, s, n;
 
-	r = pf_wait(unit, STAT_BUSY, STAT_DRQ | STAT_READY | STAT_ERR,
+	r = pf_wait(pf, STAT_BUSY, STAT_DRQ | STAT_READY | STAT_ERR,
 		    fun, "completion");
 
-	if ((read_reg(unit, 2) & 2) && (read_reg(unit, 7) & STAT_DRQ)) {
-		n = (((read_reg(unit, 4) + 256 * read_reg(unit, 5)) +
+	if ((read_reg(pf, 2) & 2) && (read_reg(pf, 7) & STAT_DRQ)) {
+		n = (((read_reg(pf, 4) + 256 * read_reg(pf, 5)) +
 		      3) & 0xfffc);
-		pi_read_block(PI, buf, n);
+		pi_read_block(pf->pi, buf, n);
 	}
 
-	s = pf_wait(unit, STAT_BUSY, STAT_READY | STAT_ERR, fun, "data done");
+	s = pf_wait(pf, STAT_BUSY, STAT_READY | STAT_ERR, fun, "data done");
 
-	pi_disconnect(PI);
+	pi_disconnect(pf->pi);
 
 	return (r ? r : s);
 }
 
-static void pf_req_sense(int unit, int quiet)
+static void pf_req_sense(struct pf_unit *pf, int quiet)
 {
 	char rs_cmd[12] =
-	    { ATAPI_REQ_SENSE, LUN, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0 };
+	    { ATAPI_REQ_SENSE, pf->lun << 5, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0 };
 	char buf[16];
 	int r;
 
-	r = pf_command(unit, rs_cmd, 16, "Request sense");
+	r = pf_command(pf, rs_cmd, 16, "Request sense");
 	mdelay(1);
 	if (!r)
-		pf_completion(unit, buf, "Request sense");
+		pf_completion(pf, buf, "Request sense");
 
 	if ((!r) && (!quiet))
 		printk("%s: Sense key: %x, ASC: %x, ASQ: %x\n",
-		       PF.name, buf[2] & 0xf, buf[12], buf[13]);
+		       pf->name, buf[2] & 0xf, buf[12], buf[13]);
 }
 
-static int pf_atapi(int unit, char *cmd, int dlen, char *buf, char *fun)
+static int pf_atapi(struct pf_unit *pf, char *cmd, int dlen, char *buf, char *fun)
 {
 	int r;
 
-	r = pf_command(unit, cmd, dlen, fun);
+	r = pf_command(pf, cmd, dlen, fun);
 	mdelay(1);
 	if (!r)
-		r = pf_completion(unit, buf, fun);
+		r = pf_completion(pf, buf, fun);
 	if (r)
-		pf_req_sense(unit, !fun);
+		pf_req_sense(pf, !fun);
 
 	return r;
 }
 
 #define DBMSG(msg)      ((verbose>1)?(msg):NULL)
 
-static void pf_lock(int unit, int func)
+static void pf_lock(struct pf_unit *pf, int func)
 {
-	char lo_cmd[12] = { ATAPI_LOCK, LUN, 0, 0, func, 0, 0, 0, 0, 0, 0, 0 };
+	char lo_cmd[12] = { ATAPI_LOCK, pf->lun << 5, 0, 0, func, 0, 0, 0, 0, 0, 0, 0 };
 
-	pf_atapi(unit, lo_cmd, 0, pf_scratch, func ? "unlock" : "lock");
+	pf_atapi(pf, lo_cmd, 0, pf_scratch, func ? "unlock" : "lock");
 }
 
-static void pf_eject(int unit)
+static void pf_eject(struct pf_unit *pf)
 {
-	char ej_cmd[12] = { ATAPI_DOOR, LUN, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0 };
+	char ej_cmd[12] = { ATAPI_DOOR, pf->lun << 5, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0 };
 
-	pf_lock(unit, 0);
-	pf_atapi(unit, ej_cmd, 0, pf_scratch, "eject");
+	pf_lock(pf, 0);
+	pf_atapi(pf, ej_cmd, 0, pf_scratch, "eject");
 }
 
 #define PF_RESET_TMO   30	/* in tenths of a second */
@@ -584,48 +557,48 @@ static void pf_sleep(int cs)
    two bytes, and different drives interpret the standard differently.
  */
 
-static int pf_reset(int unit)
+static int pf_reset(struct pf_unit *pf)
 {
 	int i, k, flg;
 	int expect[5] = { 1, 1, 1, 0x14, 0xeb };
 
-	pi_connect(PI);
-	write_reg(unit, 6, DRIVE);
-	write_reg(unit, 7, 8);
+	pi_connect(pf->pi);
+	write_reg(pf, 6, 0xa0+0x10*pf->drive);
+	write_reg(pf, 7, 8);
 
 	pf_sleep(20 * HZ / 1000);
 
 	k = 0;
-	while ((k++ < PF_RESET_TMO) && (status_reg(unit) & STAT_BUSY))
+	while ((k++ < PF_RESET_TMO) && (status_reg(pf) & STAT_BUSY))
 		pf_sleep(HZ / 10);
 
 	flg = 1;
 	for (i = 0; i < 5; i++)
-		flg &= (read_reg(unit, i + 1) == expect[i]);
+		flg &= (read_reg(pf, i + 1) == expect[i]);
 
 	if (verbose) {
-		printk("%s: Reset (%d) signature = ", PF.name, k);
+		printk("%s: Reset (%d) signature = ", pf->name, k);
 		for (i = 0; i < 5; i++)
-			printk("%3x", read_reg(unit, i + 1));
+			printk("%3x", read_reg(pf, i + 1));
 		if (!flg)
 			printk(" (incorrect)");
 		printk("\n");
 	}
 
-	pi_disconnect(PI);
+	pi_disconnect(pf->pi);
 	return flg - 1;
 }
 
-static void pf_mode_sense(int unit)
+static void pf_mode_sense(struct pf_unit *pf)
 {
 	char ms_cmd[12] =
-	    { ATAPI_MODE_SENSE, LUN, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0 };
+	    { ATAPI_MODE_SENSE, pf->lun << 5, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0 };
 	char buf[8];
 
-	pf_atapi(unit, ms_cmd, 8, buf, DBMSG("mode sense"));
-	PF.media_status = PF_RW;
+	pf_atapi(pf, ms_cmd, 8, buf, DBMSG("mode sense"));
+	pf->media_status = PF_RW;
 	if (buf[3] & 0x80)
-		PF.media_status = PF_RO;
+		pf->media_status = PF_RO;
 }
 
 static void xs(char *buf, char *targ, int offs, int len)
@@ -652,37 +625,37 @@ static int xl(char *buf, int offs)
 	return v;
 }
 
-static void pf_get_capacity(int unit)
+static void pf_get_capacity(struct pf_unit *pf)
 {
-	char rc_cmd[12] = { ATAPI_CAPACITY, LUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+	char rc_cmd[12] = { ATAPI_CAPACITY, pf->lun << 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	char buf[8];
 	int bs;
 
-	if (pf_atapi(unit, rc_cmd, 8, buf, DBMSG("get capacity"))) {
-		PF.media_status = PF_NM;
+	if (pf_atapi(pf, rc_cmd, 8, buf, DBMSG("get capacity"))) {
+		pf->media_status = PF_NM;
 		return;
 	}
-	PF.capacity = xl(buf, 0) + 1;
+	set_capacity(&pf->disk, xl(buf, 0) + 1);
 	bs = xl(buf, 4);
 	if (bs != 512) {
-		PF.capacity = 0;
+		set_capacity(&pf->disk, 0);
 		if (verbose)
 			printk("%s: Drive %d, LUN %d,"
 			       " unsupported block size %d\n",
-			       PF.name, PF.drive, PF.lun, bs);
+			       pf->name, pf->drive, pf->lun, bs);
 	}
 }
 
-static int pf_identify(int unit)
+static int pf_identify(struct pf_unit *pf)
 {
 	int dt, s;
 	char *ms[2] = { "master", "slave" };
 	char mf[10], id[18];
 	char id_cmd[12] =
-	    { ATAPI_IDENTIFY, LUN, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0 };
+	    { ATAPI_IDENTIFY, pf->lun << 5, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0 };
 	char buf[36];
 
-	s = pf_atapi(unit, id_cmd, 36, buf, "identify");
+	s = pf_atapi(pf, id_cmd, 36, buf, "identify");
 	if (s)
 		return -1;
 
@@ -690,58 +663,57 @@ static int pf_identify(int unit)
 	if ((dt != 0) && (dt != 7)) {
 		if (verbose)
 			printk("%s: Drive %d, LUN %d, unsupported type %d\n",
-			       PF.name, PF.drive, PF.lun, dt);
+			       pf->name, pf->drive, pf->lun, dt);
 		return -1;
 	}
 
 	xs(buf, mf, 8, 8);
 	xs(buf, id, 16, 16);
 
-	PF.removable = (buf[1] & 0x80);
+	pf->removable = (buf[1] & 0x80);
 
-	pf_mode_sense(unit);
-	pf_mode_sense(unit);
-	pf_mode_sense(unit);
+	pf_mode_sense(pf);
+	pf_mode_sense(pf);
+	pf_mode_sense(pf);
 
-	pf_get_capacity(unit);
+	pf_get_capacity(pf);
 
 	printk("%s: %s %s, %s LUN %d, type %d",
-	       PF.name, mf, id, ms[PF.drive], PF.lun, dt);
-	if (PF.removable)
+	       pf->name, mf, id, ms[pf->drive], pf->lun, dt);
+	if (pf->removable)
 		printk(", removable");
-	if (PF.media_status == PF_NM)
+	if (pf->media_status == PF_NM)
 		printk(", no media\n");
 	else {
-		if (PF.media_status == PF_RO)
+		if (pf->media_status == PF_RO)
 			printk(", RO");
-		printk(", %d blocks\n", PF.capacity);
+		printk(", %ld blocks\n", get_capacity(&pf->disk));
 	}
-
 	return 0;
 }
 
 /*	returns  0, with id set if drive is detected
 	        -1, if drive detection failed
 */
-static int pf_probe(int unit)
+static int pf_probe(struct pf_unit *pf)
 {
-	if (PF.drive == -1) {
-		for (PF.drive = 0; PF.drive <= 1; PF.drive++)
-			if (!pf_reset(unit)) {
-				if (PF.lun != -1)
-					return pf_identify(unit);
+	if (pf->drive == -1) {
+		for (pf->drive = 0; pf->drive <= 1; pf->drive++)
+			if (!pf_reset(pf)) {
+				if (pf->lun != -1)
+					return pf_identify(pf);
 				else
-					for (PF.lun = 0; PF.lun < 8; PF.lun++)
-						if (!pf_identify(unit))
+					for (pf->lun = 0; pf->lun < 8; pf->lun++)
+						if (!pf_identify(pf))
 							return 0;
 			}
 	} else {
-		if (pf_reset(unit))
+		if (pf_reset(pf))
 			return -1;
-		if (PF.lun != -1)
-			return pf_identify(unit);
-		for (PF.lun = 0; PF.lun < 8; PF.lun++)
-			if (!pf_identify(unit))
+		if (pf->lun != -1)
+			return pf_identify(pf);
+		for (pf->lun = 0; pf->lun < 8; pf->lun++)
+			if (!pf_identify(pf))
 				return 0;
 	}
 	return -1;
@@ -749,6 +721,7 @@ static int pf_probe(int unit)
 
 static int pf_detect(void)
 {
+	struct pf_unit *pf = units;
 	int k, unit;
 
 	printk("%s: %s version %s, major %d, cluster %d, nice %d\n",
@@ -756,30 +729,30 @@ static int pf_detect(void)
 
 	k = 0;
 	if (pf_drive_count == 0) {
-		unit = 0;
-		if (pi_init(PI, 1, -1, -1, -1, -1, -1, pf_scratch,
-			    PI_PF, verbose, PF.name)) {
-			if (!pf_probe(unit)) {
-				PF.present = 1;
+		if (pi_init(pf->pi, 1, -1, -1, -1, -1, -1, pf_scratch, PI_PF,
+			    verbose, pf->name)) {
+			if (!pf_probe(pf)) {
+				pf->present = 1;
 				k++;
 			} else
-				pi_release(PI);
+				pi_release(pf->pi);
 		}
 
 	} else
-		for (unit = 0; unit < PF_UNITS; unit++)
-			if (DU[D_PRT])
-				if (pi_init
-				    (PI, 0, DU[D_PRT], DU[D_MOD], DU[D_UNI],
-				     DU[D_PRO], DU[D_DLY], pf_scratch, PI_PF,
-				     verbose, PF.name)) {
-					if (!pf_probe(unit)) {
-						PF.present = 1;
+		for (unit = 0; unit < PF_UNITS; unit++, pf++) {
+			int *conf = *drives[unit];
+			if (!conf[D_PRT])
+				continue;
+			if (pi_init(pf->pi, 0, conf[D_PRT], conf[D_MOD],
+				    conf[D_UNI], conf[D_PRO], conf[D_DLY],
+				    pf_scratch, PI_PF, verbose, pf->name)) {
+				if (!pf_probe(pf)) {
+					pf->present = 1;
 					k++;
 				} else
-						pi_release(PI);
+					pi_release(pf->pi);
+			}
 		}
-
 	if (k)
 		return 0;
 
@@ -789,10 +762,10 @@ static int pf_detect(void)
 
 /* The i/o request engine */
 
-static int pf_start(int unit, int cmd, int b, int c)
+static int pf_start(struct pf_unit *pf, int cmd, int b, int c)
 {
 	int i;
-	char io_cmd[12] = { cmd, LUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+	char io_cmd[12] = { cmd, pf->lun << 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
 	for (i = 0; i < 4; i++) {
 		io_cmd[5 - i] = b & 0xff;
@@ -802,7 +775,7 @@ static int pf_start(int unit, int cmd, int b, int c)
 	io_cmd[8] = c & 0xff;
 	io_cmd[7] = (c >> 8) & 0xff;
 
-	i = pf_command(unit, io_cmd, c * 512, "start i/o");
+	i = pf_command(pf, io_cmd, c * 512, "start i/o");
 
 	mdelay(1);
 
@@ -811,9 +784,7 @@ static int pf_start(int unit, int cmd, int b, int c)
 
 static int pf_ready(void)
 {
-	int unit = pf_unit;
-
-	return (((status_reg(unit) & (STAT_BUSY | pf_mask)) == pf_mask));
+	return (((status_reg(pf_current) & (STAT_BUSY | pf_mask)) == pf_mask));
 }
 
 static void do_pf_request(request_queue_t * q)
@@ -823,57 +794,65 @@ static void do_pf_request(request_queue_t * q)
 	if (pf_busy)
 		return;
       repeat:
-	if (blk_queue_empty(QUEUE))
+	if (elv_queue_empty(QUEUE))
 		return;
 
-	pf_unit = unit = DEVICE_NR(CURRENT->rq_dev);
-	pf_block = CURRENT->sector;
-	pf_run = CURRENT->nr_sectors;
-	pf_count = CURRENT->current_nr_sectors;
+	pf_req = elv_next_request(QUEUE);
+	unit = DEVICE_NR(pf_req->rq_dev);
+	pf_current = units + unit;
+	pf_block = pf_req->sector;
+	pf_run = pf_req->nr_sectors;
+	pf_count = pf_req->current_nr_sectors;
 
-	if ((pf_unit >= PF_UNITS) || (pf_block + pf_count > PF.capacity)) {
-		end_request(CURRENT, 0);
+	if ((unit >= PF_UNITS) ||
+	    (pf_block + pf_count > get_capacity(&pf_current->disk))) {
+		end_request(pf_req, 0);
 		goto repeat;
 	}
 
-	pf_cmd = rq_data_dir(CURRENT);
-	pf_buf = CURRENT->buffer;
+	pf_cmd = rq_data_dir(pf_req);
+	pf_buf = pf_req->buffer;
 	pf_retries = 0;
 
 	pf_busy = 1;
 	if (pf_cmd == READ)
-		pi_do_claimed(PI, do_pf_read);
+		pi_do_claimed(pf_current->pi, do_pf_read);
 	else if (pf_cmd == WRITE)
-		pi_do_claimed(PI, do_pf_write);
+		pi_do_claimed(pf_current->pi, do_pf_write);
 	else {
 		pf_busy = 0;
-		end_request(CURRENT, 0);
+		end_request(pf_req, 0);
 		goto repeat;
 	}
 }
 
-static void pf_next_buf(int unit)
+static int pf_next_buf(void)
 {
 	long saved_flags;
 
+	pf_count--;
+	pf_run--;
+	pf_buf += 512;
+	pf_block++;
+	if (!pf_run)
+		return 0;
+	if (!pf_count)
+		return 1;
 	spin_lock_irqsave(&pf_spin_lock, saved_flags);
-	end_request(CURRENT, 1);
-	if (!pf_run) {
+	end_request(pf_req, 1);
+	pf_count = pf_req->current_nr_sectors;
+	pf_buf = pf_req->buffer;
 	spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
-		return;
-	}
-
-/* paranoia */
-
-	if (blk_queue_empty(QUEUE) ||
-	    (rq_data_dir(CURRENT) != pf_cmd) ||
-	    (DEVICE_NR(CURRENT->rq_dev) != pf_unit) ||
-	    (CURRENT->sector != pf_block))
-		printk("%s: OUCH: request list changed unexpectedly\n",
-		       PF.name);
+	return 1;
+}
 
-	pf_count = CURRENT->current_nr_sectors;
-	pf_buf = CURRENT->buffer;
+static inline void next_request(int success)
+{
+	long saved_flags;
+	spin_lock_irqsave(&pf_spin_lock, saved_flags);
+	end_request(pf_req, success);
+	pf_busy = 0;
+	do_pf_request(NULL);
 	spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
 }
 
@@ -885,23 +864,16 @@ static void do_pf_read(void)
 
 static void do_pf_read_start(void)
 {
-	int unit = pf_unit;
-	long saved_flags;
-
 	pf_busy = 1;
 
-	if (pf_start(unit, ATAPI_READ_10, pf_block, pf_run)) {
-		pi_disconnect(PI);
+	if (pf_start(pf_current, ATAPI_READ_10, pf_block, pf_run)) {
+		pi_disconnect(pf_current->pi);
 		if (pf_retries < PF_MAX_RETRIES) {
 			pf_retries++;
-			pi_do_claimed(PI, do_pf_read_start);
+			pi_do_claimed(pf_current->pi, do_pf_read_start);
 			return;
 		}
-		spin_lock_irqsave(&pf_spin_lock, saved_flags);
-		end_request(CURRENT, 0);
-		pf_busy = 0;
-		do_pf_request(NULL);
-		spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
+		next_request(0);
 		return;
 	}
 	pf_mask = STAT_DRQ;
@@ -910,42 +882,25 @@ static void do_pf_read_start(void)
 
 static void do_pf_read_drq(void)
 {
-	int unit = pf_unit;
-	long saved_flags;
-
 	while (1) {
-		if (pf_wait(unit, STAT_BUSY, STAT_DRQ | STAT_ERR,
+		if (pf_wait(pf_current, STAT_BUSY, STAT_DRQ | STAT_ERR,
 			    "read block", "completion") & STAT_ERR) {
-			pi_disconnect(PI);
+			pi_disconnect(pf_current->pi);
 			if (pf_retries < PF_MAX_RETRIES) {
-				pf_req_sense(unit, 0);
+				pf_req_sense(pf_current, 0);
 				pf_retries++;
-				pi_do_claimed(PI, do_pf_read_start);
+				pi_do_claimed(pf_current->pi, do_pf_read_start);
 				return;
 			}
-			spin_lock_irqsave(&pf_spin_lock, saved_flags);
-			end_request(CURRENT, 0);
-			pf_busy = 0;
-			do_pf_request(NULL);
-			spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
+			next_request(0);
 			return;
 		}
-		pi_read_block(PI, pf_buf, 512);
-		pf_count--;
-		pf_run--;
-		pf_buf += 512;
-		pf_block++;
-		if (!pf_run)
+		pi_read_block(pf_current->pi, pf_buf, 512);
+		if (pf_next_buf())
 			break;
-		if (!pf_count)
-			pf_next_buf(unit);
 	}
-	pi_disconnect(PI);
-	spin_lock_irqsave(&pf_spin_lock, saved_flags);
-	end_request(CURRENT, 1);
-	pf_busy = 0;
-	do_pf_request(NULL);
-	spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
+	pi_disconnect(pf_current->pi);
+	next_request(1);
 }
 
 static void do_pf_write(void)
@@ -955,51 +910,34 @@ static void do_pf_write(void)
 
 static void do_pf_write_start(void)
 {
-	int unit = pf_unit;
-	long saved_flags;
-
 	pf_busy = 1;
 
-	if (pf_start(unit, ATAPI_WRITE_10, pf_block, pf_run)) {
-		pi_disconnect(PI);
+	if (pf_start(pf_current, ATAPI_WRITE_10, pf_block, pf_run)) {
+		pi_disconnect(pf_current->pi);
 		if (pf_retries < PF_MAX_RETRIES) {
 			pf_retries++;
-			pi_do_claimed(PI, do_pf_write_start);
+			pi_do_claimed(pf_current->pi, do_pf_write_start);
 			return;
 		}
-		spin_lock_irqsave(&pf_spin_lock, saved_flags);
-		end_request(CURRENT, 0);
-		pf_busy = 0;
-		do_pf_request(NULL);
-		spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
+		next_request(0);
 		return;
 	}
 
 	while (1) {
-		if (pf_wait(unit, STAT_BUSY, STAT_DRQ | STAT_ERR,
+		if (pf_wait(pf_current, STAT_BUSY, STAT_DRQ | STAT_ERR,
 			    "write block", "data wait") & STAT_ERR) {
-			pi_disconnect(PI);
+			pi_disconnect(pf_current->pi);
 			if (pf_retries < PF_MAX_RETRIES) {
 				pf_retries++;
-				pi_do_claimed(PI, do_pf_write_start);
+				pi_do_claimed(pf_current->pi, do_pf_write_start);
 				return;
 			}
-			spin_lock_irqsave(&pf_spin_lock, saved_flags);
-			end_request(CURRENT, 0);
-			pf_busy = 0;
-			do_pf_request(NULL);
-			spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
+			next_request(0);
 			return;
 		}
-		pi_write_block(PI, pf_buf, 512);
-		pf_count--;
-		pf_run--;
-		pf_buf += 512;
-		pf_block++;
-		if (!pf_run)
+		pi_write_block(pf_current->pi, pf_buf, 512);
+		if (pf_next_buf())
 			break;
-		if (!pf_count)
-			pf_next_buf(unit);
 	}
 	pf_mask = 0;
 	ps_set_intr(do_pf_write_done, pf_ready, PF_TMO, nice);
@@ -1007,34 +945,24 @@ static void do_pf_write_start(void)
 
 static void do_pf_write_done(void)
 {
-	int unit = pf_unit;
-	long saved_flags;
-
-	if (pf_wait(unit, STAT_BUSY, 0, "write block", "done") & STAT_ERR) {
-		pi_disconnect(PI);
+	if (pf_wait(pf_current, STAT_BUSY, 0, "write block", "done") & STAT_ERR) {
+		pi_disconnect(pf_current->pi);
 		if (pf_retries < PF_MAX_RETRIES) {
 			pf_retries++;
-			pi_do_claimed(PI, do_pf_write_start);
+			pi_do_claimed(pf_current->pi, do_pf_write_start);
 			return;
 		}
-		spin_lock_irqsave(&pf_spin_lock, saved_flags);
-		end_request(CURRENT, 0);
-		pf_busy = 0;
-		do_pf_request(NULL);
-		spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
+		next_request(0);
 		return;
 	}
-	pi_disconnect(PI);
-	spin_lock_irqsave(&pf_spin_lock, saved_flags);
-	end_request(CURRENT, 1);
-	pf_busy = 0;
-	do_pf_request(NULL);
-	spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
+	pi_disconnect(pf_current->pi);
+	next_request(1);
 }
 
 static int __init pf_init(void)
 {				/* preliminary initialisation */
-	int i;
+	struct pf_unit *pf;
+	int unit;
 	request_queue_t *q;
 
 	if (disable)
@@ -1055,19 +983,29 @@ static int __init pf_init(void)
 	blk_queue_max_phys_segments(q, cluster);
 	blk_queue_max_hw_segments(q, cluster);
 
-	for (i = 0; i < PF_UNITS; i++)
-		register_disk(NULL, mk_kdev(MAJOR_NR, i), 1, &pf_fops, 0);
-
+	for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) {
+		struct gendisk *disk = &pf->disk;
+		if (!pf->present)
+			continue;
+		add_gendisk(disk);
+		register_disk(disk, mk_kdev(disk->major, disk->first_minor),
+				1<<disk->minor_shift, disk->fops,
+				get_capacity(disk));
+	}
 	return 0;
 }
 
 static void __exit pf_exit(void)
 {
+	struct pf_unit *pf;
 	int unit;
 	unregister_blkdev(MAJOR_NR, name);
-	for (unit = 0; unit < PF_UNITS; unit++)
-		if (PF.present)
-			pi_release(PI);
+	for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) {
+		if (!pf->present)
+			continue;
+		del_gendisk(&pf->disk);
+		pi_release(pf->pi);
+	}
 }
 
 MODULE_LICENSE("GPL");