Staging: comedi: Remove device_create_result_type typedef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
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 d38addd01d4a62eb13683e65b592ba672db24656..524bef968a1c2781e6f04593fb9662836528d36d 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2130,7 +2130,7 @@ int comedi_alloc_board_minor(struct device *hardware_device)
 {
        unsigned long flags;
        struct comedi_device_file_info *info;
-       device_create_result_type *csdev;
+       struct device *csdev;
        unsigned i;
 
        info = kzalloc(sizeof(struct comedi_device_file_info), GFP_KERNEL);
@@ -2197,7 +2197,7 @@ int comedi_alloc_subdevice_minor(struct comedi_device *dev, struct comedi_subdev
 {
        unsigned long flags;
        struct comedi_device_file_info *info;
-       device_create_result_type *csdev;
+       struct device *csdev;
        unsigned i;
 
        info = kmalloc(sizeof(struct comedi_device_file_info), GFP_KERNEL);

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 3f9b2d027168610bf064fb10ed7095a2e8e3ea61..4333139e5245740ee4462e483cc599ec0d93eded 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -121,8 +121,6 @@
 #define COMEDI_NUM_BOARD_MINORS 0x30
 #define COMEDI_FIRST_SUBDEVICE_MINOR COMEDI_NUM_BOARD_MINORS
 
-typedef struct device device_create_result_type;
-
 #define COMEDI_DEVICE_CREATE(cs, parent, devt, drvdata, device, fmt...) \
        device_create(cs, ((parent) ? (parent) : (device)), devt, drvdata, fmt)
 
@@ -183,7 +181,7 @@ struct comedi_subdevice {
 
        unsigned int state;
 
-       device_create_result_type *class_dev;
+       struct device *class_dev;
        int minor;
 };
 
@@ -256,7 +254,7 @@ struct comedi_device {
        struct comedi_driver *driver;
        void *private;
 
-       device_create_result_type *class_dev;
+       struct device *class_dev;
        int minor;
        /* hw_dev is passed to dma_alloc_coherent when allocating async buffers
         * for subdevices that have async_dma_dir set to something other than