Merge branch 'bcache-for-upstream' of git://evilpiepirate.org/~kent/linux-bcache...

[~andy/linux] / drivers / message / i2o / i2o_proc.c

diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index 70a840f9b2832982e27587f2a509cf610e872d0a..b7d87cd227a902b4de1c405dcf726419217b1adc 100644 (file)
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
@@ -1913,14 +1913,12 @@ static void i2o_proc_device_add(struct proc_dir_entry *dir,
 
        osm_debug("adding device /proc/i2o/%s/%s\n", dev->iop->name, buff);
 
-       devdir = proc_mkdir(buff, dir);
+       devdir = proc_mkdir_data(buff, 0, dir, dev);
        if (!devdir) {
                osm_warn("Could not allocate procdir!\n");
                return;
        }
 
-       devdir->data = dev;
-
        i2o_proc_create_entries(devdir, generic_dev_entries, dev);
 
        /* Inform core that we want updates about this device's status */
@@ -1954,12 +1952,10 @@ static int i2o_proc_iop_add(struct proc_dir_entry *dir,
 
        osm_debug("adding IOP /proc/i2o/%s\n", c->name);
 
-       iopdir = proc_mkdir(c->name, dir);
+       iopdir = proc_mkdir_data(c->name, 0, dir, c);
        if (!iopdir)
                return -1;
 
-       iopdir->data = c;
-
        i2o_proc_create_entries(iopdir, i2o_proc_generic_iop_entries, c);
 
        list_for_each_entry(dev, &c->devices, list)