diff options
| author | Bill Pemberton | 2009-03-17 03:05:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-04-03 23:53:56 +0200 |
| commit | 0bfbbe8f09617247c87d3b626cbf007c423afff1 (patch) | |
| tree | e4657032e09e64a6ed5f4d0a89fd37245a5837d6 | |
| parent | Staging: comedi: Remove comedi_lrange typedef (diff) | |
| download | kernel-qcow2-linux-0bfbbe8f09617247c87d3b626cbf007c423afff1.tar.gz kernel-qcow2-linux-0bfbbe8f09617247c87d3b626cbf007c423afff1.tar.xz kernel-qcow2-linux-0bfbbe8f09617247c87d3b626cbf007c423afff1.zip | |
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>
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 4 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedidev.h | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index d38addd01d4a..524bef968a1c 100644 --- 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 3f9b2d027168..4333139e5245 100644 --- 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 |