diff options
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/drivers/line.c | 2 | ||||
-rw-r--r-- | arch/um/drivers/ssl.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/stdio_console.c | 1 | ||||
-rw-r--r-- | arch/um/drivers/ubd_kern.c | 18 | ||||
-rw-r--r-- | arch/um/include/line.h | 1 |
5 files changed, 2 insertions, 21 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 6c2d4ccaf20f..5ca57ca33713 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include "linux/list.h" | 8 | #include "linux/list.h" |
9 | #include "linux/kd.h" | 9 | #include "linux/kd.h" |
10 | #include "linux/interrupt.h" | 10 | #include "linux/interrupt.h" |
11 | #include "linux/devfs_fs_kernel.h" | ||
12 | #include "asm/uaccess.h" | 11 | #include "asm/uaccess.h" |
13 | #include "chan_kern.h" | 12 | #include "chan_kern.h" |
14 | #include "irq_user.h" | 13 | #include "irq_user.h" |
@@ -655,7 +654,6 @@ struct tty_driver *line_register_devfs(struct lines *set, | |||
655 | 654 | ||
656 | driver->driver_name = line_driver->name; | 655 | driver->driver_name = line_driver->name; |
657 | driver->name = line_driver->device_name; | 656 | driver->name = line_driver->device_name; |
658 | driver->devfs_name = line_driver->devfs_name; | ||
659 | driver->major = line_driver->major; | 657 | driver->major = line_driver->major; |
660 | driver->minor_start = line_driver->minor_start; | 658 | driver->minor_start = line_driver->minor_start; |
661 | driver->type = line_driver->type; | 659 | driver->type = line_driver->type; |
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index a4d6415bc8c4..6dafd6fbfdae 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c | |||
@@ -54,7 +54,6 @@ static int ssl_remove(int n); | |||
54 | static struct line_driver driver = { | 54 | static struct line_driver driver = { |
55 | .name = "UML serial line", | 55 | .name = "UML serial line", |
56 | .device_name = "ttyS", | 56 | .device_name = "ttyS", |
57 | .devfs_name = "tts/", | ||
58 | .major = TTY_MAJOR, | 57 | .major = TTY_MAJOR, |
59 | .minor_start = 64, | 58 | .minor_start = 64, |
60 | .type = TTY_DRIVER_TYPE_SERIAL, | 59 | .type = TTY_DRIVER_TYPE_SERIAL, |
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c index 61db8b2fc83f..856f568c2687 100644 --- a/arch/um/drivers/stdio_console.c +++ b/arch/um/drivers/stdio_console.c | |||
@@ -60,7 +60,6 @@ static int con_remove(int n); | |||
60 | static struct line_driver driver = { | 60 | static struct line_driver driver = { |
61 | .name = "UML console", | 61 | .name = "UML console", |
62 | .device_name = "tty", | 62 | .device_name = "tty", |
63 | .devfs_name = "vc/", | ||
64 | .major = TTY_MAJOR, | 63 | .major = TTY_MAJOR, |
65 | .minor_start = 0, | 64 | .minor_start = 0, |
66 | .type = TTY_DRIVER_TYPE_CONSOLE, | 65 | .type = TTY_DRIVER_TYPE_CONSOLE, |
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 290cec6d69e2..0345e2551247 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "linux/blkdev.h" | 25 | #include "linux/blkdev.h" |
26 | #include "linux/hdreg.h" | 26 | #include "linux/hdreg.h" |
27 | #include "linux/init.h" | 27 | #include "linux/init.h" |
28 | #include "linux/devfs_fs_kernel.h" | ||
29 | #include "linux/cdrom.h" | 28 | #include "linux/cdrom.h" |
30 | #include "linux/proc_fs.h" | 29 | #include "linux/proc_fs.h" |
31 | #include "linux/ctype.h" | 30 | #include "linux/ctype.h" |
@@ -628,7 +627,6 @@ static int ubd_new_disk(int major, u64 size, int unit, | |||
628 | 627 | ||
629 | { | 628 | { |
630 | struct gendisk *disk; | 629 | struct gendisk *disk; |
631 | char from[sizeof("ubd/nnnnn\0")], to[sizeof("discnnnnn/disc\0")]; | ||
632 | int err; | 630 | int err; |
633 | 631 | ||
634 | disk = alloc_disk(1 << UBD_SHIFT); | 632 | disk = alloc_disk(1 << UBD_SHIFT); |
@@ -639,20 +637,10 @@ static int ubd_new_disk(int major, u64 size, int unit, | |||
639 | disk->first_minor = unit << UBD_SHIFT; | 637 | disk->first_minor = unit << UBD_SHIFT; |
640 | disk->fops = &ubd_blops; | 638 | disk->fops = &ubd_blops; |
641 | set_capacity(disk, size / 512); | 639 | set_capacity(disk, size / 512); |
642 | if(major == MAJOR_NR){ | 640 | if(major == MAJOR_NR) |
643 | sprintf(disk->disk_name, "ubd%c", 'a' + unit); | 641 | sprintf(disk->disk_name, "ubd%c", 'a' + unit); |
644 | sprintf(disk->devfs_name, "ubd/disc%d", unit); | 642 | else |
645 | sprintf(from, "ubd/%d", unit); | ||
646 | sprintf(to, "disc%d/disc", unit); | ||
647 | err = devfs_mk_symlink(from, to); | ||
648 | if(err) | ||
649 | printk("ubd_new_disk failed to make link from %s to " | ||
650 | "%s, error = %d\n", from, to, err); | ||
651 | } | ||
652 | else { | ||
653 | sprintf(disk->disk_name, "ubd_fake%d", unit); | 643 | sprintf(disk->disk_name, "ubd_fake%d", unit); |
654 | sprintf(disk->devfs_name, "ubd_fake/disc%d", unit); | ||
655 | } | ||
656 | 644 | ||
657 | /* sysfs register (not for ide fake devices) */ | 645 | /* sysfs register (not for ide fake devices) */ |
658 | if (major == MAJOR_NR) { | 646 | if (major == MAJOR_NR) { |
@@ -841,7 +829,6 @@ int ubd_init(void) | |||
841 | { | 829 | { |
842 | int i; | 830 | int i; |
843 | 831 | ||
844 | devfs_mk_dir("ubd"); | ||
845 | if (register_blkdev(MAJOR_NR, "ubd")) | 832 | if (register_blkdev(MAJOR_NR, "ubd")) |
846 | return -1; | 833 | return -1; |
847 | 834 | ||
@@ -855,7 +842,6 @@ int ubd_init(void) | |||
855 | char name[sizeof("ubd_nnn\0")]; | 842 | char name[sizeof("ubd_nnn\0")]; |
856 | 843 | ||
857 | snprintf(name, sizeof(name), "ubd_%d", fake_major); | 844 | snprintf(name, sizeof(name), "ubd_%d", fake_major); |
858 | devfs_mk_dir(name); | ||
859 | if (register_blkdev(fake_major, "ubd")) | 845 | if (register_blkdev(fake_major, "ubd")) |
860 | return -1; | 846 | return -1; |
861 | } | 847 | } |
diff --git a/arch/um/include/line.h b/arch/um/include/line.h index 6ac0f8252e21..27bf2f6fbc05 100644 --- a/arch/um/include/line.h +++ b/arch/um/include/line.h | |||
@@ -17,7 +17,6 @@ | |||
17 | struct line_driver { | 17 | struct line_driver { |
18 | char *name; | 18 | char *name; |
19 | char *device_name; | 19 | char *device_name; |
20 | char *devfs_name; | ||
21 | short major; | 20 | short major; |
22 | short minor_start; | 21 | short minor_start; |
23 | short type; | 22 | short type; |