[PATCH] amiga floppy switched to alloc_disk()

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 53c752eed240e7e916c921d48581817ceb87bf23..22790c4145fe37cd031c99324ed0fb6c04e21b75 100644 (file)
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1643,7 +1643,7 @@ static int floppy_open(struct inode *inode, struct file *filp)
        unit[drive].dtype=&data_types[system];
        unit[drive].blocks=unit[drive].type->heads*unit[drive].type->tracks*
                data_types[system].sects*unit[drive].type->sect_mult;
-       set_capacity(&unit[drive].disk, unit[drive].blocks);
+       set_capacity(unit[drive].gendisk, unit[drive].blocks);
 
        printk(KERN_INFO "fd%d: accessing %s-disk with %s-layout\n",drive,
               unit[drive].type->name, data_types[system].name);
@@ -1731,25 +1731,31 @@ static int __init fd_probe_drives(void)
        drives=0;
        nomem=0;
        for(drive=0;drive<FD_MAX_UNITS;drive++) {
+               struct gendisk *disk;
                fd_probe(drive);
-               if (unit[drive].type->code != FD_NODRIVE) {
-                       struct gendisk *disk = &unit[drive].disk;
-                       drives++;
-                       if ((unit[drive].trackbuf = kmalloc(FLOPPY_MAX_SECTORS * 512, GFP_KERNEL)) == NULL) {
-                               printk("no mem for ");
-                               unit[drive].type = &drive_types[num_dr_types - 1]; /* FD_NODRIVE */
-                               drives--;
-                               nomem = 1;
-                       }
-                       printk("fd%d ",drive);
-                       disk->major = MAJOR_NR;
-                       disk->first_minor = drive;
-                       disk->minor_shift = 0;
-                       disk->fops = &floppy_fops;
-                       sprintf(disk->disk_name, "fd%d", drive);
-                       set_capacity(disk, 880*2);
-                       add_disk(disk);
+               if (unit[drive].type->code == FD_NODRIVE)
+                       continue;
+               disk = alloc_disk();
+               if (!disk) {
+                       unit[drive].type->code = FD_NODRIVE;
+                       continue;
+               }
+               unit[drive].gendisk = disk;
+               drives++;
+               if ((unit[drive].trackbuf = kmalloc(FLOPPY_MAX_SECTORS * 512, GFP_KERNEL)) == NULL) {
+                       printk("no mem for ");
+                       unit[drive].type = &drive_types[num_dr_types - 1]; /* FD_NODRIVE */
+                       drives--;
+                       nomem = 1;
                }
+               printk("fd%d ",drive);
+               disk->major = MAJOR_NR;
+               disk->first_minor = drive;
+               disk->minor_shift = 0;
+               disk->fops = &floppy_fops;
+               sprintf(disk->disk_name, "fd%d", drive);
+               set_capacity(disk, 880*2);
+               add_disk(disk);
        }
        if ((drives > 0) || (nomem == 0)) {
                if (drives == 0)
@@ -1766,7 +1772,7 @@ static struct gendisk *floppy_find(int minor)
        int drive = minor & 3;
        if (unit[drive].type->code == FD_NODRIVE)
                return NULL;
-       return &unit[drive].disk;
+       return unit[drive].gendisk;
 }
 
 int __init amiga_floppy_init(void)
@@ -1875,7 +1881,8 @@ void cleanup_module(void)
 
        for( i = 0; i < FD_MAX_UNITS; i++) {
                if (unit[i].type->code != FD_NODRIVE) {
-                       del_gendisk(&unit[i].disk);
+                       del_gendisk(unit[i].gendisk);
+                       put_disk(unit[i].gendisk);
                        kfree(unit[i].trackbuf);
                }
        }

diff --git a/include/linux/amifd.h b/include/linux/amifd.h
index eac36f77fa8fd034dd7ba895c32b49f63850fc44..346993268b451313dbb9cfb0893662e868185e35 100644 (file)
--- a/include/linux/amifd.h
+++ b/include/linux/amifd.h
@@ -55,7 +55,7 @@ struct amiga_floppy_struct {
     int busy;                  /* true when drive is active */
     int dirty;                 /* true when trackbuf is not on disk */
     int status;                        /* current error code for unit */
-    struct gendisk disk;
+    struct gendisk *gendisk;
 };
 #endif