diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-21 00:15:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 15:25:06 -0400 |
commit | 1a715c5cf917326a285533d1116d725f5f2593c2 (patch) | |
tree | 23833b5463940023bd4074a3a465c245adaff9fa /drivers/block/floppy.c | |
parent | 79021a625c36162d24c852bbbdb04f0c1cb32db3 (diff) |
[PATCH] devfs: Remove devfs_mk_bdev() function from the kernel tree
Removes the devfs_mk_bdev() function and all callers of it.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/block/floppy.c')
-rw-r--r-- | drivers/block/floppy.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 03a4dff05f27..ec14e6e6bccb 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -224,7 +224,6 @@ static struct completion device_release; | |||
224 | static unsigned short virtual_dma_port = 0x3f0; | 224 | static unsigned short virtual_dma_port = 0x3f0; |
225 | irqreturn_t floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 225 | irqreturn_t floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs); |
226 | static int set_dor(int fdc, char mask, char data); | 226 | static int set_dor(int fdc, char mask, char data); |
227 | static void register_devfs_entries(int drive) __init; | ||
228 | 227 | ||
229 | #define K_64 0x10000 /* 64KB */ | 228 | #define K_64 0x10000 /* 64KB */ |
230 | 229 | ||
@@ -3676,7 +3675,6 @@ static void __init config_types(void) | |||
3676 | first = 0; | 3675 | first = 0; |
3677 | } | 3676 | } |
3678 | printk("%s fd%d is %s", prepend, drive, name); | 3677 | printk("%s fd%d is %s", prepend, drive, name); |
3679 | register_devfs_entries(drive); | ||
3680 | } | 3678 | } |
3681 | *UDP = *params; | 3679 | *UDP = *params; |
3682 | } | 3680 | } |
@@ -3969,23 +3967,6 @@ static int t360[] = { 1, 0 }, | |||
3969 | static int *table_sup[] = | 3967 | static int *table_sup[] = |
3970 | { NULL, t360, t1200, t3in + 5 + 8, t3in + 5, t3in, t3in }; | 3968 | { NULL, t360, t1200, t3in + 5 + 8, t3in + 5, t3in, t3in }; |
3971 | 3969 | ||
3972 | static void __init register_devfs_entries(int drive) | ||
3973 | { | ||
3974 | int base_minor = (drive < 4) ? drive : (124 + drive); | ||
3975 | |||
3976 | if (UDP->cmos < ARRAY_SIZE(default_drive_params)) { | ||
3977 | int i = 0; | ||
3978 | do { | ||
3979 | int minor = base_minor + (table_sup[UDP->cmos][i] << 2); | ||
3980 | |||
3981 | devfs_mk_bdev(MKDEV(FLOPPY_MAJOR, minor), | ||
3982 | S_IFBLK | S_IRUSR | S_IWUSR | S_IRGRP | | ||
3983 | S_IWGRP, "floppy/%d%s", drive, | ||
3984 | table[table_sup[UDP->cmos][i]]); | ||
3985 | } while (table_sup[UDP->cmos][i++]); | ||
3986 | } | ||
3987 | } | ||
3988 | |||
3989 | /* | 3970 | /* |
3990 | * Floppy Driver initialization | 3971 | * Floppy Driver initialization |
3991 | * ============================= | 3972 | * ============================= |