mm/hmm/test: use char dev with struct device to get device node

[linux-2.6-microblaze.git] / lib / test_hmm.c

diff --git a/lib/test_hmm.c b/lib/test_hmm.c
index e3965ca..6a33f6b 100644 (file)
--- a/lib/test_hmm.c
+++ b/lib/test_hmm.c
@@ -107,8 +107,8 @@ struct dmirror_chunk {
  */
 struct dmirror_device {
        struct cdev             cdevice;
-       struct hmm_devmem       *devmem;
        unsigned int            zone_device_type;
+       struct device           device;
 
        unsigned int            devmem_capacity;
        unsigned int            devmem_count;
@@ -1390,7 +1390,14 @@ static int dmirror_device_init(struct dmirror_device *mdevice, int id)
 
        cdev_init(&mdevice->cdevice, &dmirror_fops);
        mdevice->cdevice.owner = THIS_MODULE;
-       ret = cdev_add(&mdevice->cdevice, dev, 1);
+       device_initialize(&mdevice->device);
+       mdevice->device.devt = dev;
+
+       ret = dev_set_name(&mdevice->device, "hmm_dmirror%u", id);
+       if (ret)
+               return ret;
+
+       ret = cdev_device_add(&mdevice->cdevice, &mdevice->device);
        if (ret)
                return ret;
 
@@ -1416,7 +1423,7 @@ static void dmirror_device_remove(struct dmirror_device *mdevice)
                kfree(mdevice->devmem_chunks);
        }
 
-       cdev_del(&mdevice->cdevice);
+       cdev_device_del(&mdevice->cdevice, &mdevice->device);
 }
 
 static int __init hmm_dmirror_init(void)