From a9044d91990d4ba611f95fc5c84e2531fa54a5f9 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 13 Jun 2012 15:41:36 -0700
Subject: [PATCH] staging: comedi: 8255: rename the private data structure
Rename the 8255's private data structure from subdev_8255_struct
to subdev_8255_private.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/comedi/drivers/8255.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c
index 23b9accc34d3..446dfc5c970a 100644
--- a/drivers/staging/comedi/drivers/8255.c
+++ b/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;
--
2.34.1