[PATCH] Re: Linux 2.5.38

More trivial fixes: typos in partitions/check.c, block/floppy.c and
acorn/block/fd1772.c + replacement of #define with inline in block/floppy.c
(fd_eject()).

drivers/acorn/block/fd1772.c

@@ -1542,7 +1542,7 @@ static struct block_device_operations floppy_fops =
 static struct gendisk *floppy_find(int minor)
 {
 	int drive = minor & 3;
-	if ((minor>> 2) > NUM_DISK_TYPES || minor >= FD_MAX_UNITS)
+	if ((minor>> 2) > NUM_DISK_TYPES || drive >= FD_MAX_UNITS)
 		return NULL;
 	return &disks[drive];
 }

drivers/block/floppy.c

@@ -600,7 +600,10 @@ static unsigned char in_sector_offset;	/* offset within physical sector,
 					 * expressed in units of 512 bytes */
 
 #ifndef fd_eject
-#define fd_eject(x) -EINVAL
+static inline int fd_eject(int drive)
+{
+	return -EINVAL;
+}
 #endif
 
 #ifdef DEBUGT
@@ -4556,7 +4559,7 @@ int init_module(void)
 
 void cleanup_module(void)
 {
-	int i;
+	int drive;
 		
 	unregister_sys_device(&device_floppy);
 	devfs_unregister (devfs_handle);

fs/partitions/check.c

@@ -362,7 +362,7 @@ static void devfs_create_cdrom(struct gendisk *dev)
 		pos = devfs_generate_path(dev->disk_de, rname+3, sizeof(rname)-3);
 		if (pos >= 0) {
 			strncpy(rname + pos, "../", 3);
-			devfs_mk_symlink(devfs_handle, vname,
+			devfs_mk_symlink(cdroms, vname,
 					 DEVFS_FL_DEFAULT,
 					 rname + pos, &slave, NULL);
 			devfs_auto_unregister(dev->de, slave);