merge linus into release branch

Conflicts:

	drivers/acpi/acpi_memhotplug.c

21 files changed, 11 insertions, 157 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index dd8a1501142f..50ca1aa4ee3b 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -2530,7 +2530,6 @@ static boolean DAC960_RegisterBlockDevice(DAC960_Controller_T *Controller)
         blk_queue_max_sectors(RequestQueue, Controller->MaxBlocksPerCommand);
         disk->queue = RequestQueue;
         sprintf(disk->disk_name, "rd/c%dd%d", Controller->ControllerNumber, n);
-        sprintf(disk->devfs_name, "rd/host%d/target%d", Controller->ControllerNumber, n);
         disk->major = MajorNumber;
         disk->first_minor = n << DAC960_MaxPartitionsBits;
         disk->fops = &DAC960_BlockDeviceOperations;
diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c
index 196c0ec9cd54..a317e4303952 100644
--- a/drivers/block/acsi.c
+++ b/drivers/block/acsi.c
@@ -1732,13 +1732,10 @@ int acsi_init( void )
                 struct gendisk *disk = acsi_gendisk[i];
                 sprintf(disk->disk_name, "ad%c", 'a'+i);
                 aip = &acsi_info[NDevices];
-                sprintf(disk->devfs_name, "ad/target%d/lun%d", aip->target, aip->lun);
                 disk->major = ACSI_MAJOR;
                 disk->first_minor = i << 4;
-                if (acsi_info[i].type != HARDDISK) {
+                if (acsi_info[i].type != HARDDISK)
                         disk->minors = 1;
-                        strcat(disk->devfs_name, "/disc");
-                }
                 disk->fops = &acsi_fops;
                 disk->private_data = &acsi_info[i];
                 set_capacity(disk, acsi_info[i].size);
diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c
index 4cb9c1336287..4030a8fd1187 100644
--- a/drivers/block/acsi_slm.c
+++ b/drivers/block/acsi_slm.c
@@ -65,7 +65,6 @@ not be guaranteed. There are several ways to assure this:
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/smp_lock.h>
 
 #include <asm/pgtable.h>
@@ -1005,11 +1004,6 @@ int slm_init( void )
         BufferP = SLMBuffer;
         SLMState = IDLE;
         
-        devfs_mk_dir("slm");
-        for (i = 0; i < MAX_SLM; i++) {
-                devfs_mk_cdev(MKDEV(ACSI_MAJOR, i),
-                                S_IFCHR|S_IRUSR|S_IWUSR, "slm/%d", i);
-        }
         return 0;
 }
 
@@ -1032,10 +1026,6 @@ int init_module(void)
 
 void cleanup_module(void)
 {
-        int i;
-        for (i = 0; i < MAX_SLM; i++)
-                devfs_remove("slm/%d", i);
-        devfs_remove("slm");
         if (unregister_chrdev( ACSI_MAJOR, "slm" ) != 0)
                 printk( KERN_ERR "acsi_slm: cleanup_module failed\n");
         atari_stram_free( SLMBuffer );
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 39b0f53186e8..05fb08312c01 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3248,7 +3248,6 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
 
                 q->queuedata = hba[i];
                 sprintf(disk->disk_name, "cciss/c%dd%d", i, j);
-                sprintf(disk->devfs_name, "cciss/host%d/target%d", i, j);
                 disk->major = hba[i]->major;
                 disk->first_minor = j << NWD_SHIFT;
                 disk->fops = &cciss_fops;
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 5eb6fb7b5cfa..bfd245df0a8c 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -33,7 +33,6 @@
 #include <linux/blkpg.h>
 #include <linux/timer.h>
 #include <linux/proc_fs.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/init.h>
 #include <linux/hdreg.h>
 #include <linux/spinlock.h>
@@ -348,7 +347,6 @@ static void __devexit cpqarray_remove_one(int i)
         for(j = 0; j < NWD; j++) {
                 if (ida_gendisk[i][j]->flags & GENHD_FL_UP)
                         del_gendisk(ida_gendisk[i][j]);
-                devfs_remove("ida/c%dd%d",i,j);
                 put_disk(ida_gendisk[i][j]);
         }
         blk_cleanup_queue(hba[i]->queue);
@@ -1807,8 +1805,6 @@ static void getgeometry(int ctlr)
 
                                 }
 
-                                sprintf(disk->devfs_name, "ida/c%dd%d", ctlr, log_unit);
-
                                 info_p->phys_drives =
                                     sense_config_buf->ctlr_phys_drv;
                                 info_p->drv_assign_map
@@ -1844,7 +1840,6 @@ static void __exit cpqarray_exit(void)
                 }
         }
 
-        devfs_remove("ida");
         remove_proc_entry("cpqarray", proc_root_driver);
 }
 
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index dff1e67b1dd4..0242cbb86a87 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -177,7 +177,6 @@ static int print_unex = 1;
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/platform_device.h>
 #include <linux/buffer_head.h>  /* for invalidate_buffers() */
 #include <linux/mutex.h>
@@ -224,7 +223,6 @@ static struct completion device_release;
 static unsigned short virtual_dma_port = 0x3f0;
 irqreturn_t floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static int set_dor(int fdc, char mask, char data);
-static void register_devfs_entries(int drive) __init;
 
 #define K_64    0x10000         /* 64KB */
 
@@ -3676,7 +3674,6 @@ static void __init config_types(void)
                                 first = 0;
                         }
                         printk("%s fd%d is %s", prepend, drive, name);
-                        register_devfs_entries(drive);
                 }
                 *UDP = *params;
         }
@@ -3954,37 +3951,6 @@ static struct block_device_operations floppy_fops = {
         .media_changed  = check_floppy_change,
         .revalidate_disk = floppy_revalidate,
 };
-static char *table[] = {
-        "", "d360", "h1200", "u360", "u720", "h360", "h720",
-        "u1440", "u2880", "CompaQ", "h1440", "u1680", "h410",
-        "u820", "h1476", "u1722", "h420", "u830", "h1494", "u1743",
-        "h880", "u1040", "u1120", "h1600", "u1760", "u1920",
-        "u3200", "u3520", "u3840", "u1840", "u800", "u1600",
-        NULL
-};
-static int t360[] = { 1, 0 },
-        t1200[] = { 2, 5, 6, 10, 12, 14, 16, 18, 20, 23, 0 },
-        t3in[] = { 8, 9, 26, 27, 28, 7, 11, 15, 19, 24, 25, 29, 31, 3, 4, 13,
-                        17, 21, 22, 30, 0 };
-static int *table_sup[] =
-    { NULL, t360, t1200, t3in + 5 + 8, t3in + 5, t3in, t3in };
-
-static void __init register_devfs_entries(int drive)
-{
-        int base_minor = (drive < 4) ? drive : (124 + drive);
-
-        if (UDP->cmos < ARRAY_SIZE(default_drive_params)) {
-                int i = 0;
-                do {
-                        int minor = base_minor + (table_sup[UDP->cmos][i] << 2);
-
-                        devfs_mk_bdev(MKDEV(FLOPPY_MAJOR, minor),
-                                      S_IFBLK | S_IRUSR | S_IWUSR | S_IRGRP |
-                                      S_IWGRP, "floppy/%d%s", drive,
-                                      table[table_sup[UDP->cmos][i]]);
-                } while (table_sup[UDP->cmos][i++]);
-        }
-}
 
 /*
  * Floppy Driver initialization
@@ -4261,11 +4227,9 @@ static int __init floppy_init(void)
                 motor_off_timer[dr].function = motor_off_callback;
         }
 
-        devfs_mk_dir("floppy");
-
         err = register_blkdev(FLOPPY_MAJOR, "fd");
         if (err)
-                goto out_devfs_remove;
+                goto out_put_disk;
 
         floppy_queue = blk_init_queue(do_fd_request, &floppy_lock);
         if (!floppy_queue) {
@@ -4424,8 +4388,6 @@ out_unreg_region:
         blk_cleanup_queue(floppy_queue);
 out_unreg_blkdev:
         unregister_blkdev(FLOPPY_MAJOR, "fd");
-out_devfs_remove:
-        devfs_remove("floppy");
 out_put_disk:
         while (dr--) {
                 del_timer(&motor_off_timer[dr]);
@@ -4586,19 +4548,6 @@ static void floppy_release_irq_and_dma(void)
 
 static char *floppy;
 
-static void unregister_devfs_entries(int drive)
-{
-        int i;
-
-        if (UDP->cmos < ARRAY_SIZE(default_drive_params)) {
-                i = 0;
-                do {
-                        devfs_remove("floppy/%d%s", drive,
-                                     table[table_sup[UDP->cmos][i]]);
-                } while (table_sup[UDP->cmos][i++]);
-        }
-}
-
 static void __init parse_floppy_cfg_string(char *cfg)
 {
         char *ptr;
@@ -4635,13 +4584,11 @@ void cleanup_module(void)
                 if ((allowed_drive_mask & (1 << drive)) &&
                     fdc_state[FDC(drive)].version != FDC_NONE) {
                         del_gendisk(disks[drive]);
-                        unregister_devfs_entries(drive);
                         device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos);
                         platform_device_unregister(&floppy_device[drive]);
                 }
                 put_disk(disks[drive]);
         }
-        devfs_remove("floppy");
 
         del_timer_sync(&fd_timeout);
         del_timer_sync(&fd_timer);
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 3c74ea729fc7..013c5daddb0b 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -63,7 +63,6 @@
 #include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/init.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/smp_lock.h>
 #include <linux/swap.h>
 #include <linux/slab.h>
@@ -210,7 +209,7 @@ static int do_lo_send_aops(struct loop_device *lo, struct bio_vec *bvec,
 {
         struct file *file = lo->lo_backing_file; /* kudos to NFsckingS */
         struct address_space *mapping = file->f_mapping;
-        struct address_space_operations *aops = mapping->a_ops;
+        const struct address_space_operations *aops = mapping->a_ops;
         pgoff_t index;
         unsigned offset, bv_offs;
         int len, ret;
@@ -784,7 +783,7 @@ static int loop_set_fd(struct loop_device *lo, struct file *lo_file,
 
         error = -EINVAL;
         if (S_ISREG(inode->i_mode) || S_ISBLK(inode->i_mode)) {
-                struct address_space_operations *aops = mapping->a_ops;
+                const struct address_space_operations *aops = mapping->a_ops;
                 /*
                  * If we can't read - sorry. If we only can't write - well,
                  * it's going to be read-only.
@@ -1277,8 +1276,6 @@ static int __init loop_init(void)
                         goto out_mem3;
         }
 
-        devfs_mk_dir("loop");
-
         for (i = 0; i < max_loop; i++) {
                 struct loop_device *lo = &loop_dev[i];
                 struct gendisk *disk = disks[i];
@@ -1296,7 +1293,6 @@ static int __init loop_init(void)
                 disk->first_minor = i;
                 disk->fops = &lo_fops;
                 sprintf(disk->disk_name, "loop%d", i);
-                sprintf(disk->devfs_name, "loop/%d", i);
                 disk->private_data = lo;
                 disk->queue = lo->lo_queue;
         }
@@ -1310,7 +1306,6 @@ static int __init loop_init(void)
 out_mem4:
         while (i--)
                 blk_cleanup_queue(loop_dev[i].lo_queue);
-        devfs_remove("loop");
         i = max_loop;
 out_mem3:
         while (i--)
@@ -1333,7 +1328,6 @@ static void loop_exit(void)
                 blk_cleanup_queue(loop_dev[i].lo_queue);
                 put_disk(disks[i]);
         }
-        devfs_remove("loop");
         if (unregister_blkdev(LOOP_MAJOR, "loop"))
                 printk(KERN_WARNING "loop: cannot unregister blkdev\n");
 
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 7f554f2ed079..39662f0c9cce 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -29,8 +29,6 @@
 #include <linux/kernel.h>
 #include <net/sock.h>
 
-#include <linux/devfs_fs_kernel.h>
-
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/types.h>
@@ -642,7 +640,6 @@ static int __init nbd_init(void)
         printk(KERN_INFO "nbd: registered device at major %d\n", NBD_MAJOR);
         dprintk(DBG_INIT, "nbd: debugflags=0x%x\n", debugflags);
 
-        devfs_mk_dir("nbd");
         for (i = 0; i < nbds_max; i++) {
                 struct gendisk *disk = nbd_dev[i].disk;
                 nbd_dev[i].file = NULL;
@@ -660,7 +657,6 @@ static int __init nbd_init(void)
                 disk->private_data = &nbd_dev[i];
                 disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;
                 sprintf(disk->disk_name, "nbd%d", i);
-                sprintf(disk->devfs_name, "nbd/%d", i);
                 set_capacity(disk, 0x7ffffc00ULL << 1); /* 2 TB */
                 add_disk(disk);
         }
@@ -686,7 +682,6 @@ static void __exit nbd_cleanup(void)
                         put_disk(disk);
                 }
         }
-        devfs_remove("nbd");
         unregister_blkdev(NBD_MAJOR, "nbd");
         printk(KERN_INFO "nbd: unregistered device at major %d\n", NBD_MAJOR);
 }
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 852b564e903a..1a9dee19efcf 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -707,7 +707,7 @@ static int pf_detect(void)
                         if (pi_init(pf->pi, 0, conf[D_PRT], conf[D_MOD],
                                     conf[D_UNI], conf[D_PRO], conf[D_DLY],
                                     pf_scratch, PI_PF, verbose, pf->name)) {
-                                if (!pf_probe(pf) && pf->disk) {
+                                if (pf->disk && !pf_probe(pf)) {
                                         pf->present = 1;
                                         k++;
                                 } else
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 79b868254032..13f998aa1cd3 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -156,7 +156,6 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/fs.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/mtio.h>
@@ -674,25 +673,15 @@ static int __init pg_init(void)
                 err = PTR_ERR(pg_class);
                 goto out_chrdev;
         }
-        devfs_mk_dir("pg");
         for (unit = 0; unit < PG_UNITS; unit++) {
                 struct pg *dev = &devices[unit];
-                if (dev->present) {
+                if (dev->present)
                         class_device_create(pg_class, NULL, MKDEV(major, unit),
                                         NULL, "pg%u", unit);
-                        err = devfs_mk_cdev(MKDEV(major, unit),
-                                      S_IFCHR | S_IRUSR | S_IWUSR, "pg/%u",
-                                      unit);
-                        if (err) 
-                                goto out_class;
-                }
         }
         err = 0;
         goto out;
 
-out_class:
-        class_device_destroy(pg_class, MKDEV(major, unit));
-        class_destroy(pg_class);
 out_chrdev:
         unregister_chrdev(major, "pg");
 out:
@@ -705,13 +694,10 @@ static void __exit pg_exit(void)
 
         for (unit = 0; unit < PG_UNITS; unit++) {
                 struct pg *dev = &devices[unit];
-                if (dev->present) {
+                if (dev->present)
                         class_device_destroy(pg_class, MKDEV(major, unit));
-                        devfs_remove("pg/%u", unit);
-                }
         }
         class_destroy(pg_class);
-        devfs_remove("pg");
         unregister_chrdev(major, name);
 
         for (unit = 0; unit < PG_UNITS; unit++) {
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index d2013d362403..35fb26636721 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -141,7 +141,6 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3};
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/fs.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/mtio.h>
@@ -971,32 +970,15 @@ static int __init pt_init(void)
                 goto out_chrdev;
         }
 
-        devfs_mk_dir("pt");
         for (unit = 0; unit < PT_UNITS; unit++)
                 if (pt[unit].present) {
                         class_device_create(pt_class, NULL, MKDEV(major, unit),
                                         NULL, "pt%d", unit);
-                        err = devfs_mk_cdev(MKDEV(major, unit),
-                                      S_IFCHR | S_IRUSR | S_IWUSR,
-                                      "pt/%d", unit);
-                        if (err) {
-                                class_device_destroy(pt_class, MKDEV(major, unit));
-                                goto out_class;
-                        }
                         class_device_create(pt_class, NULL, MKDEV(major, unit + 128),
                                         NULL, "pt%dn", unit);
-                        err = devfs_mk_cdev(MKDEV(major, unit + 128),
-                                      S_IFCHR | S_IRUSR | S_IWUSR,
-                                      "pt/%dn", unit);
-                        if (err) {
-                                class_device_destroy(pt_class, MKDEV(major, unit + 128));
-                                goto out_class;
-                        }
                 }
         goto out;
 
-out_class:
-        class_destroy(pt_class);
 out_chrdev:
         unregister_chrdev(major, "pt");
 out:
@@ -1009,12 +991,9 @@ static void __exit pt_exit(void)
         for (unit = 0; unit < PT_UNITS; unit++)
                 if (pt[unit].present) {
                         class_device_destroy(pt_class, MKDEV(major, unit));
-                        devfs_remove("pt/%d", unit);
                         class_device_destroy(pt_class, MKDEV(major, unit + 128));
-                        devfs_remove("pt/%dn", unit);
                 }
         class_destroy(pt_class);
-        devfs_remove("pt");
         unregister_chrdev(major, name);
         for (unit = 0; unit < PT_UNITS; unit++)
                 if (pt[unit].present)
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index a04f60693c39..3e4cce5e4736 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2612,7 +2612,6 @@ static struct file_operations pkt_ctl_fops = {
 static struct miscdevice pkt_misc = {
         .minor          = MISC_DYNAMIC_MINOR,
         .name           = "pktcdvd",
-        .devfs_name     = "pktcdvd/control",
         .fops           = &pkt_ctl_fops
 };
 
diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
index bea75f2cb211..a729013a3973 100644
--- a/drivers/block/ps2esdi.c
+++ b/drivers/block/ps2esdi.c
@@ -421,7 +421,6 @@ static int __init ps2esdi_geninit(void)
                 disk->major = PS2ESDI_MAJOR;
                 disk->first_minor = i<<6;
                 sprintf(disk->disk_name, "ed%c", 'a'+i);
-                sprintf(disk->devfs_name, "ed/target%d", i);
                 disk->fops = &ps2esdi_fops;
                 ps2esdi_gendisk[i] = disk;
         }
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 940bfd7951e5..a9e1c2524c2a 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -50,7 +50,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/pagemap.h>
 #include <linux/blkdev.h>
 #include <linux/genhd.h>
@@ -191,7 +190,7 @@ static int ramdisk_set_page_dirty(struct page *page)
         return 0;
 }
 
-static struct address_space_operations ramdisk_aops = {
+static const struct address_space_operations ramdisk_aops = {
         .readpage       = ramdisk_readpage,
         .prepare_write  = ramdisk_prepare_write,
         .commit_write   = ramdisk_commit_write,
@@ -412,7 +411,6 @@ static void __exit rd_cleanup(void)
                 put_disk(rd_disks[i]);
                 blk_cleanup_queue(rd_queue[i]);
         }
-        devfs_remove("rd");
         unregister_blkdev(RAMDISK_MAJOR, "ramdisk");
 }
 
@@ -442,8 +440,6 @@ static int __init rd_init(void)
                 goto out;
         }
 
-        devfs_mk_dir("rd");
-
         for (i = 0; i < CONFIG_BLK_DEV_RAM_COUNT; i++) {
                 struct gendisk *disk = rd_disks[i];
 
@@ -461,7 +457,6 @@ static int __init rd_init(void)
                 disk->queue = rd_queue[i];
                 disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;
                 sprintf(disk->disk_name, "ram%d", i);
-                sprintf(disk->devfs_name, "rd/%d", i);
                 set_capacity(disk, rd_size * 2);
                 add_disk(rd_disks[i]);
         }
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 01f042f6f1c4..628877945f9b 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -25,7 +25,6 @@
 #include <linux/fd.h>
 #include <linux/ioctl.h>
 #include <linux/blkdev.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
@@ -1019,8 +1018,6 @@ int swim3_init(void)
         int err = -ENOMEM;
         int i;
 
-        devfs_mk_dir("floppy");
-
         swim = find_devices("floppy");
         while (swim && (floppy_count < MAX_FLOPPIES))
         {
@@ -1064,7 +1061,6 @@ int swim3_init(void)
                 disk->queue = swim3_queue;
                 disk->flags |= GENHD_FL_REMOVABLE;
                 sprintf(disk->disk_name, "fd%d", i);
-                sprintf(disk->devfs_name, "floppy/%d", i);
                 set_capacity(disk, 2880);
                 add_disk(disk);
         }
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 2ae08b343b93..10a4aa5fb54d 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -18,7 +18,6 @@
 #include <linux/spinlock.h>
 #include <linux/blkdev.h>
 #include <linux/sched.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/interrupt.h>
 #include <linux/compiler.h>
 #include <linux/workqueue.h>
@@ -1510,7 +1509,6 @@ static int carm_init_disks(struct carm_host *host)
                 port->disk = disk;
                 sprintf(disk->disk_name, DRV_NAME "/%u",
                         (unsigned int) (host->id * CARM_MAX_PORTS) + i);
-                sprintf(disk->devfs_name, DRV_NAME "/%u_%u", host->id, i);
                 disk->major = host->major;
                 disk->first_minor = i * CARM_MINORS_PER_MAJOR;
                 disk->fops = &carm_bd_ops;
@@ -1672,8 +1670,6 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (host->flags & FL_DYN_MAJOR)
                 host->major = rc;
 
-        devfs_mk_dir(DRV_NAME);
-
         rc = carm_init_disks(host);
         if (rc)
                 goto err_out_blkdev_disks;
@@ -1694,9 +1690,10 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         DPRINTK("waiting for probe_comp\n");
         wait_for_completion(&host->probe_comp);
 
-        printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",
+        printk(KERN_INFO "%s: pci %s, ports %d, io %llx, irq %u, major %d\n",
                host->name, pci_name(pdev), (int) CARM_MAX_PORTS,
-               pci_resource_start(pdev, 0), pdev->irq, host->major);
+               (unsigned long long)pci_resource_start(pdev, 0),
+                   pdev->irq, host->major);
 
         carm_host_id++;
         pci_set_drvdata(pdev, host);
@@ -1738,7 +1735,6 @@ static void carm_remove_one (struct pci_dev *pdev)
 
         free_irq(pdev->irq, host);
         carm_free_disks(host);
-        devfs_remove(DRV_NAME);
         unregister_blkdev(host->major, host->name);
         if (host->major == 160)
                 clear_bit(0, &carm_major_alloc);
diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 60e9a9457c6b..d62b49fbf10c 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -24,12 +24,10 @@
 #include <linux/usb.h>
 #include <linux/usb_usual.h>
 #include <linux/blkdev.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/timer.h>
 #include <scsi/scsi.h>
 
 #define DRV_NAME "ub"
-#define DEVFS_NAME DRV_NAME
 
 #define UB_MAJOR 180
 
@@ -2291,7 +2289,6 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum)
                 goto err_diskalloc;
 
         sprintf(disk->disk_name, DRV_NAME "%c", lun->id + 'a');
-        sprintf(disk->devfs_name, DEVFS_NAME "/%c", lun->id + 'a');
         disk->major = UB_MAJOR;
         disk->first_minor = lun->id * UB_PARTS_PER_LUN;
         disk->fops = &ub_bd_fops;
@@ -2445,7 +2442,6 @@ static int __init ub_init(void)
 
         if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0)
                 goto err_regblkdev;
-        devfs_mk_dir(DEVFS_NAME);
 
         if ((rc = usb_register(&ub_driver)) != 0)
                 goto err_register;
@@ -2454,7 +2450,6 @@ static int __init ub_init(void)
         return 0;
 
 err_register:
-        devfs_remove(DEVFS_NAME);
         unregister_blkdev(UB_MAJOR, DRV_NAME);
 err_regblkdev:
         return rc;
@@ -2464,7 +2459,6 @@ static void __exit ub_exit(void)
 {
         usb_deregister(&ub_driver);
 
-        devfs_remove(DEVFS_NAME);
         unregister_blkdev(UB_MAJOR, DRV_NAME);
         usb_usual_clear_present(USB_US_TYPE_UB);
 }
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index f7d4c65a7b8c..585197b95af7 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -1192,7 +1192,6 @@ static int __init mm_init(void)
         for (i = 0; i < num_cards; i++) {
                 struct gendisk *disk = mm_gendisk[i];
                 sprintf(disk->disk_name, "umem%c", 'a'+i);
-                sprintf(disk->devfs_name, "umem/card%d", i);
                 spin_lock_init(&cards[i].lock);
                 disk->major = major_nr;
                 disk->first_minor  = i << MM_SHIFT;
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index b0df4f5ab97a..ec5a1b90a0a2 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -59,7 +59,6 @@ MODULE_LICENSE("GPL");
  * numbers 0-255 we get a maximum of 32 disks.
  */
 #define VIOD_GENHD_NAME         "iseries/vd"
-#define VIOD_GENHD_DEVFS_NAME   "iseries/disc"
 
 #define VIOD_VERS               "1.64"
 
@@ -523,8 +522,6 @@ retry:
         else
                 snprintf(g->disk_name, sizeof(g->disk_name),
                                 VIOD_GENHD_NAME "%c", 'a' + (dev_no % 26));
-        snprintf(g->devfs_name, sizeof(g->devfs_name),
-                        "%s%d", VIOD_GENHD_DEVFS_NAME, dev_no);
         g->fops = &viodasd_fops;
         g->queue = q;
         g->private_data = d;
diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index cbce7c5e9445..e828e4cbd3e1 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -215,7 +215,6 @@ static int __init xd_init(void)
                 disk->major = XT_DISK_MAJOR;
                 disk->first_minor = i<<6;
                 sprintf(disk->disk_name, "xd%c", i+'a');
-                sprintf(disk->devfs_name, "xd/target%d", i);
                 disk->fops = &xd_fops;
                 disk->private_data = p;
                 disk->queue = xd_queue;
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index bb5e8d665a2a..82ddbdd7bd4b 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -354,7 +354,6 @@ z2_init(void)
     z2ram_gendisk->first_minor = 0;
     z2ram_gendisk->fops = &z2_fops;
     sprintf(z2ram_gendisk->disk_name, "z2ram");
-    strcpy(z2ram_gendisk->devfs_name, z2ram_gendisk->disk_name);
 
     z2ram_gendisk->queue = z2_queue;
     add_disk(z2ram_gendisk);