patch-1.3.33 linux/drivers/block/hd.c

Next file: linux/drivers/block/ide.c
Previous file: linux/drivers/block/gscd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.32/linux/drivers/block/hd.c linux/drivers/block/hd.c
@@ -1047,18 +1047,18 @@
 	block_fsync		/* fsync */
 };
 
-unsigned long hd_init(unsigned long mem_start, unsigned long mem_end)
+int hd_init(void)
 {
 	if (register_blkdev(MAJOR_NR,"hd",&hd_fops)) {
 		printk("hd: unable to get major %d for harddisk\n",MAJOR_NR);
-		return mem_start;
+		return -1;
 	}
 	blk_dev[MAJOR_NR].request_fn = DEVICE_REQUEST;
 	read_ahead[MAJOR_NR] = 8;		/* 8 sector (4kB) read-ahead */
 	hd_gendisk.next = gendisk_head;
 	gendisk_head = &hd_gendisk;
 	timer_table[HD_TIMER].fn = hd_times_out;
-	return mem_start;
+	return 0;
 }
 
 #define DEVICE_BUSY busy[target]

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this