---

yaml --- r: 317358 b: refs/heads/master c: a9044d9 h: refs/heads/master v: v3
git-mirror · Jun 14, 2012 · 4c2c1dc · 4c2c1dc
1 parent 42be834
commit 4c2c1dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e40e8375c0eb546b66c5e66f5e10b68ec46f7b95
+refs/heads/master: a9044d91990d4ba611f95fc5c84e2531fa54a5f9
diff --git a/trunk/drivers/staging/comedi/drivers/8255.c b/trunk/drivers/staging/comedi/drivers/8255.c
@@ -97,15 +97,15 @@ I/O port base address can be found in the output of 'lspci -v'.
 #define CR_A_MODE(a)	((a)<<5)
 #define CR_CW		0x80
 
-struct subdev_8255_struct {
+struct subdev_8255_private {
 	unsigned long cb_arg;
 	int (*cb_func) (int, int, int, unsigned long);
 	int have_irq;
 };
 
-#define CALLBACK_ARG	(((struct subdev_8255_struct *)s->private)->cb_arg)
-#define CALLBACK_FUNC	(((struct subdev_8255_struct *)s->private)->cb_func)
-#define subdevpriv	((struct subdev_8255_struct *)s->private)
+#define CALLBACK_ARG	(((struct subdev_8255_private *)s->private)->cb_arg)
+#define CALLBACK_FUNC	(((struct subdev_8255_private *)s->private)->cb_func)
+#define subdevpriv	((struct subdev_8255_private *)s->private)
 
 void subdev_8255_interrupt(struct comedi_device *dev,
 			   struct comedi_subdevice *s)
@@ -316,7 +316,7 @@ int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice *s,
 	s->range_table = &range_digital;
 	s->maxdata = 1;
 
-	s->private = kmalloc(sizeof(struct subdev_8255_struct), GFP_KERNEL);
+	s->private = kmalloc(sizeof(struct subdev_8255_private), GFP_KERNEL);
 	if (!s->private)
 		return -ENOMEM;