---

yaml --- r: 354341 b: refs/heads/master c: f65cc54 h: refs/heads/master i: 354339: 11be97d v: v3
git-mirror · Feb 4, 2013 · f6b7d24 · f6b7d24
1 parent 323fdf7
commit f6b7d24
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9ab1c2f7eb6bc5d885429381e773bc1a61646ca
+refs/heads/master: f65cc5447eaea9f7be1ff54e27c9658a66c5910f
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c
@@ -2352,9 +2352,9 @@ int comedi_find_board_minor(struct device *hardware_device)
 	return -ENODEV;
 }
 
-int comedi_alloc_subdevice_minor(struct comedi_device *dev,
-				 struct comedi_subdevice *s)
+int comedi_alloc_subdevice_minor(struct comedi_subdevice *s)
 {
+	struct comedi_device *dev = s->device;
 	struct comedi_file_info *info;
 	struct device *csdev;
 	unsigned i;

diff --git a/trunk/drivers/staging/comedi/comedi_internal.h b/trunk/drivers/staging/comedi/comedi_internal.h
@@ -11,8 +11,7 @@ int do_rangeinfo_ioctl(struct comedi_device *dev,
 int comedi_alloc_board_minor(struct device *hardware_device);
 void comedi_free_board_minor(unsigned minor);
 int comedi_find_board_minor(struct device *hardware_device);
-int comedi_alloc_subdevice_minor(struct comedi_device *dev,
-				 struct comedi_subdevice *s);
+int comedi_alloc_subdevice_minor(struct comedi_subdevice *s);
 void comedi_free_subdevice_minor(struct comedi_subdevice *s);
 
 int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,

diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c
@@ -209,7 +209,7 @@ static int __comedi_device_postconfig_async(struct comedi_device *dev,
 			return ret;
 	}
 
-	comedi_alloc_subdevice_minor(dev, s);
+	comedi_alloc_subdevice_minor(s);
 
 	return 0;
 }