Commit f0d80e91 authored by Christoph Hellwig's avatar Christoph Hellwig

[PATCH] devfs: swim3

parent 6dfb870f
...@@ -1015,6 +1015,7 @@ int swim3_init(void) ...@@ -1015,6 +1015,7 @@ int swim3_init(void)
disk->private_data = &floppy_states[i]; disk->private_data = &floppy_states[i];
disk->queue = &swim3_queue; disk->queue = &swim3_queue;
sprintf(disk->disk_name, "fd%d", i); sprintf(disk->disk_name, "fd%d", i);
sprintf(disk->devfs_name, "floppy/%d", i);
set_capacity(disk, 2880); set_capacity(disk, 2880);
add_disk(disk); add_disk(disk);
} }
...@@ -1031,7 +1032,6 @@ static int swim3_add_device(struct device_node *swim) ...@@ -1031,7 +1032,6 @@ static int swim3_add_device(struct device_node *swim)
{ {
struct device_node *mediabay; struct device_node *mediabay;
struct floppy_state *fs = &floppy_states[floppy_count]; struct floppy_state *fs = &floppy_states[floppy_count];
char floppy_name[16];
if (swim->n_addrs < 2) if (swim->n_addrs < 2)
{ {
...@@ -1093,12 +1093,6 @@ static int swim3_add_device(struct device_node *swim) ...@@ -1093,12 +1093,6 @@ static int swim3_add_device(struct device_node *swim)
printk(KERN_INFO "fd%d: SWIM3 floppy controller %s\n", floppy_count, printk(KERN_INFO "fd%d: SWIM3 floppy controller %s\n", floppy_count,
mediabay ? "in media bay" : ""); mediabay ? "in media bay" : "");
sprintf(floppy_name, "floppy/%d", floppy_count);
devfs_register(NULL, floppy_name,
DEVFS_FL_DEFAULT, FLOPPY_MAJOR, floppy_count,
S_IFBLK | S_IRUSR | S_IWUSR | S_IRGRP |S_IWGRP,
&floppy_fops, NULL);
floppy_count++; floppy_count++;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment