staging: comedi: remove COMEDI_DEVICE_CREATE macro, expand all callers

This is no longer needed as the code is now in the main kernel tree.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 419976b..e90e3cc 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2175,9 +2175,8 @@ int comedi_alloc_board_minor(struct device *hardware_device)
                return -EBUSY;
        }
        info->device->minor = i;
-       csdev = COMEDI_DEVICE_CREATE(comedi_class, NULL,
-                                    MKDEV(COMEDI_MAJOR, i), NULL,
-                                    hardware_device, "comedi%i", i);
+       csdev = device_create(comedi_class, hardware_device,
+                             MKDEV(COMEDI_MAJOR, i), NULL, "comedi%i", i);
        if (!IS_ERR(csdev))
                info->device->class_dev = csdev;
        dev_set_drvdata(csdev, info);
@@ -2276,10 +2275,9 @@ int comedi_alloc_subdevice_minor(struct comedi_device *dev,
                return -EBUSY;
        }
        s->minor = i;
-       csdev = COMEDI_DEVICE_CREATE(comedi_class, dev->class_dev,
-                                    MKDEV(COMEDI_MAJOR, i), NULL, NULL,
-                                    "comedi%i_subd%i", dev->minor,
-                                    (int)(s - dev->subdevices));
+       csdev = device_create(comedi_class, dev->class_dev,
+                             MKDEV(COMEDI_MAJOR, i), NULL, "comedi%i_subd%i",
+                             dev->minor, (int)(s - dev->subdevices));
        if (!IS_ERR(csdev))
                s->class_dev = csdev;
        dev_set_drvdata(csdev, info);

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 68aa917..7a0d4bc 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -61,9 +61,6 @@
 #define COMEDI_NUM_BOARD_MINORS 0x30
 #define COMEDI_FIRST_SUBDEVICE_MINOR COMEDI_NUM_BOARD_MINORS
 
-#define COMEDI_DEVICE_CREATE(cs, parent, devt, drvdata, device, fmt...) \
-       device_create(cs, ((parent) ? (parent) : (device)), devt, drvdata, fmt)
-
 struct comedi_subdevice {
        struct comedi_device *device;
        int type;