[PATCH] cdu31a.c

	* switched to private queue
	* set ->queue
	* slightly cleaned up

drivers/cdrom/cdu31a.c

@@ -177,7 +177,6 @@
 #include "cdu31a.h"
 
 #define MAJOR_NR CDU31A_CDROM_MAJOR
-#define DEVICE_NR(device) (minor(device))
 #include <linux/blk.h>
 
 #define CDU31A_READAHEAD 4	/* 128 sector, 64kB, 32 reads read-ahead */
@@ -238,6 +237,7 @@ static volatile unsigned short sony_cd_result_reg;
 static volatile unsigned short sony_cd_read_reg;
 static volatile unsigned short sony_cd_fifost_reg;
 
+static struct request_queue cdu31a_queue;
 static spinlock_t cdu31a_lock = SPIN_LOCK_UNLOCKED; /* queue lock */
 
 static int sony_spun_up = 0;	/* Has the drive been spun up? */
@@ -1531,6 +1531,7 @@ read_data_block(char *buffer,
  */
 static void do_cdu31a_request(request_queue_t * q)
 {
+	struct request *req;
 	int block;
 	int nblock;
 	unsigned char res_reg[12];
@@ -1578,46 +1579,48 @@ static void do_cdu31a_request(request_queue_t * q)
 	del_timer(&cdu31a_abort_timer);
 
 	while (1) {
-	      cdu31a_request_startover:
 		/*
 		 * The beginning here is stolen from the hard disk driver.  I hope
 		 * it's right.
 		 */
-		if (blk_queue_empty(QUEUE))
+		if (blk_queue_empty(q))
 			goto end_do_cdu31a_request;
 
-		if (!sony_spun_up) {
+		if (!sony_spun_up)
 			scd_spinup();
-		}
 
-		block = CURRENT->sector;
-		nblock = CURRENT->nr_sectors;
+		req = elv_next_request(q);
+		block = req->sector;
+		nblock = req->nr_sectors;
 
 		if (!sony_toc_read) {
 			printk("CDU31A: TOC not read\n");
-			end_request(CURRENT, 0);
-			goto cdu31a_request_startover;
+			end_request(req, 0);
+			continue;
 		}
 
-		if(CURRENT->flags & REQ_CMD) {
-			switch (rq_data_dir(CURRENT)) {
-			case READ:
+		/* WTF??? */
+		if (!(req->flags & REQ_CMD))
+			continue;
+		if (rq_data_dir(req) == WRITE) {
+			end_request(req, 0);
+			continue;
+		}
+		if (rq_data_dir(req) != READ)
+			panic("CDU31A: Unknown cmd");
 		/*
 		 * If the block address is invalid or the request goes beyond the end of
 		 * the media, return an error.
 		 */
 		if ((block / 4) >= sony_toc.lead_out_start_lba) {
-					printk
-						("CDU31A: Request past end of media\n");
-					end_request(CURRENT, 0);
-					goto cdu31a_request_startover;
+			printk("CDU31A: Request past end of media\n");
+			end_request(req, 0);
+			continue;
 		}
-				if (((block + nblock) / 4) >=
-				    sony_toc.lead_out_start_lba) {
-					printk
-						("CDU31A: Request past end of media\n");
-					end_request(CURRENT, 0);
-					goto cdu31a_request_startover;
+		if (((block + nblock) / 4) >= sony_toc.lead_out_start_lba) {
+			printk("CDU31A: Request past end of media\n");
+			end_request(req, 0);
+			continue;
 		}
 
 		num_retries = 0;
@@ -1627,17 +1630,16 @@ static void do_cdu31a_request(request_queue_t * q)
 
 		if (!sony_toc_read) {
 			printk("CDU31A: TOC not read\n");
-					end_request(CURRENT, 0);
-					goto cdu31a_request_startover;
+			end_request(req, 0);
+			continue;
 		}
 
 		/* If no data is left to be read from the drive, start the
 		   next request. */
 		if (sony_blocks_left == 0) {
-					if (start_request
-					    (block / 4, CDU31A_READAHEAD / 4, 0)) {
-						end_request(CURRENT, 0);
-						goto cdu31a_request_startover;
+			if (start_request(block / 4, CDU31A_READAHEAD / 4, 0)) {
+				end_request(req, 0);
+				continue;
 			}
 		}
 		/* If the requested block is not the next one waiting in
@@ -1645,58 +1647,43 @@ static void do_cdu31a_request(request_queue_t * q)
 		   new one. */
 		else if (block != sony_next_block) {
 #if DEBUG
-					printk
-						("CDU31A Warning: Read for block %d, expected %d\n",
+			printk("CDU31A Warning: Read for block %d, expected %d\n",
 				 block, sony_next_block);
 #endif
 			abort_read();
 			if (!sony_toc_read) {
 				printk("CDU31A: TOC not read\n");
-						end_request(CURRENT, 0);
-						goto cdu31a_request_startover;
+				end_request(req, 0);
+				continue;
 			}
-					if (start_request
-					    (block / 4, CDU31A_READAHEAD / 4, 0)) {
-						printk
-							("CDU31a: start request failed\n");
-						end_request(CURRENT, 0);
-						goto cdu31a_request_startover;
+			if (start_request(block / 4, CDU31A_READAHEAD / 4, 0)) {
+				printk("CDU31a: start request failed\n");
+				end_request(req, 0);
+				continue;
 			}
 		}
 
-				read_data_block(CURRENT->buffer, block, nblock,
-						res_reg, &res_size);
-				if (res_reg[0] == 0x20) {
+		read_data_block(req->buffer, block, nblock, res_reg, &res_size);
+
+		if (res_reg[0] != 0x20) {
+			end_request(req, 1);
+			continue;
+		}
+
 		if (num_retries > MAX_CDU31A_RETRIES) {
-						end_request(CURRENT, 0);
-						goto cdu31a_request_startover;
+			end_request(req, 0);
+			continue;
 		}
 
 		num_retries++;
 		if (res_reg[1] == SONY_NOT_SPIN_ERR) {
-						do_sony_cd_cmd(SONY_SPIN_UP_CMD,
-							       NULL, 0, res_reg,
+			do_sony_cd_cmd(SONY_SPIN_UP_CMD, NULL, 0, res_reg,
 					&res_size);
 		} else {
-						printk
-							("CDU31A: %s error for block %d, nblock %d\n",
-							 translate_error(res_reg[1]),
-							 block, nblock);
+			printk("CDU31A: %s error for block %d, nblock %d\n",
+				 translate_error(res_reg[1]), block, nblock);
 		}
 		goto try_read_again;
-				} else {
-					end_request(CURRENT, 1);
-				}
-				break;
-
-			case WRITE:
-				end_request(CURRENT, 0);
-				break;
-
-			default:
-				panic("CDU31A: Unknown cmd");
-			}
-		}
 	}
       end_do_cdu31a_request:
 	spin_lock_irq(q->queue_lock);
@@ -3451,9 +3438,7 @@ int __init cdu31a_init(void)
 	is_a_cdu31a =
 	    strcmp("CD-ROM CDU31A", drive_config.product_id) == 0;
 
-	blk_init_queue(BLK_DEFAULT_QUEUE(MAJOR_NR),
-		       do_cdu31a_request,
-		       &cdu31a_lock);
+	blk_init_queue(&cdu31a_queue, do_cdu31a_request, &cdu31a_lock);
 
 	init_timer(&cdu31a_abort_timer);
 	cdu31a_abort_timer.function = handle_abort_timeout;
@@ -3462,6 +3447,7 @@ int __init cdu31a_init(void)
 	scd_gendisk = disk;
 	if (register_cdrom(&scd_info))
 		goto errout0;
+	disk->queue = &cdu31a_queue;
 	add_disk(disk);
 
 	disk_changed = 1;
@@ -3469,7 +3455,7 @@ int __init cdu31a_init(void)
 
 errout0:
 	printk("Unable to register CDU-31a with Uniform cdrom driver\n");
-	blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
+	blk_cleanup_queue(&cdu31a_queue);
 	put_disk(disk);
 errout1:
 	if (unregister_blkdev(MAJOR_NR, "cdu31a")) {
@@ -3496,7 +3482,7 @@ void __exit cdu31a_exit(void)
 		return;
 	}
 
-	blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
+	blk_cleanup_queue(&cdu31a_queue);
 
 	if (cdu31a_irq > 0)
 		free_irq(cdu31a_irq, NULL);