e1000: remove unused code and make symbols static

[linux-2.6-omap-h63xx.git] / fs / partitions / check.c

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 2ef313a96b665a09b3e076a6259d131459fc1900..51c6a748df4921947659abb114fc189f2508fa95 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -18,10 +18,8 @@
 #include <linux/fs.h>
 #include <linux/kmod.h>
 #include <linux/ctype.h>
-#include <linux/devfs_fs_kernel.h>
 
 #include "check.h"
-#include "devfs.h"
 
 #include "acorn.h"
 #include "amiga.h"
@@ -161,18 +159,11 @@ check_partition(struct gendisk *hd, struct block_device *bdev)
        if (!state)
                return NULL;
 
-#ifdef CONFIG_DEVFS_FS
-       if (hd->devfs_name[0] != '\0') {
-               printk(KERN_INFO " /dev/%s:", hd->devfs_name);
+       disk_name(hd, 0, state->name);
+       printk(KERN_INFO " %s:", state->name);
+       if (isdigit(state->name[strlen(state->name)-1]))
                sprintf(state->name, "p");
-       }
-#endif
-       else {
-               disk_name(hd, 0, state->name);
-               printk(KERN_INFO " %s:", state->name);
-               if (isdigit(state->name[strlen(state->name)-1]))
-                       sprintf(state->name, "p");
-       }
+
        state->limit = hd->minors;
        i = res = 0;
        while (!res && check_part[i]) {
@@ -328,7 +319,6 @@ void delete_partition(struct gendisk *disk, int part)
        p->nr_sects = 0;
        p->ios[0] = p->ios[1] = 0;
        p->sectors[0] = p->sectors[1] = 0;
-       devfs_remove("%s/part%d", disk->devfs_name, part);
        sysfs_remove_link(&p->kobj, "subsystem");
        if (p->holder_dir)
                kobject_unregister(p->holder_dir);
@@ -349,10 +339,7 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len)
        p->start_sect = start;
        p->nr_sects = len;
        p->partno = part;
-
-       devfs_mk_bdev(MKDEV(disk->major, disk->first_minor + part),
-                       S_IFBLK|S_IRUSR|S_IWUSR,
-                       "%s/part%d", disk->devfs_name, part);
+       p->policy = disk->policy;
 
        if (isdigit(disk->kobj.name[strlen(disk->kobj.name)-1]))
                snprintf(p->kobj.name,KOBJ_NAME_LEN,"%sp%d",disk->kobj.name,part);
@@ -423,14 +410,8 @@ void register_disk(struct gendisk *disk)
        disk_sysfs_add_subdirs(disk);
 
        /* No minors to use for partitions */
-       if (disk->minors == 1) {
-               if (disk->devfs_name[0] != '\0')
-                       devfs_add_disk(disk);
+       if (disk->minors == 1)
                goto exit;
-       }
-
-       /* always add handle for the whole disk */
-       devfs_add_partitioned(disk);
 
        /* No such device (e.g., media were just removed) */
        if (!get_capacity(disk))
@@ -538,8 +519,6 @@ void del_gendisk(struct gendisk *disk)
        disk_stat_set_all(disk, 0);
        disk->stamp = 0;
 
-       devfs_remove_disk(disk);
-
        kobject_uevent(&disk->kobj, KOBJ_REMOVE);
        if (disk->holder_dir)
                kobject_unregister(disk->holder_dir);