* [PATCH] Staging: comedi: Fix build problem
@ 2009-03-20 16:36 Alessio Igor Bogani
2009-03-21 4:36 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Alessio Igor Bogani @ 2009-03-20 16:36 UTC (permalink / raw)
To: Linux-next; +Cc: Alessio Igor Bogani
[...]
CC [M] drivers/staging/comedi/comedi_compat32.o
drivers/staging/comedi/comedi_compat32.c: In function ‘compat_chaninfo’:
drivers/staging/comedi/comedi_compat32.c:135: error: dereferencing pointer to incomplete type
drivers/staging/comedi/comedi_compat32.c:139: error: dereferencing pointer to incomplete type
drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
drivers/staging/comedi/comedi_compat32.c:145: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
drivers/staging/comedi/comedi_compat32.c:145: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
drivers/staging/comedi/comedi_compat32.c:145: warning: type defaults to ‘int’ in declaration of ‘type name’
drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
[...]
Signed-off-by: Alessio Igor Bogani <abogani@texware•it>
---
drivers/staging/comedi/comedi.h | 4 ++--
drivers/staging/comedi/comedi_fops.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index e6b5f16..405b191 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -294,7 +294,7 @@ enum comedi_support_level {
#define COMEDI_DEVCONFIG _IOW(CIO, 0, struct comedi_devconfig)
#define COMEDI_DEVINFO _IOR(CIO, 1, struct comedi_devinfo)
#define COMEDI_SUBDINFO _IOR(CIO, 2, struct comedi_subdinfo)
-#define COMEDI_CHANINFO _IOR(CIO, 3, struct comedi_chaninfo)
+#define COMEDI_CHANINFO _IOR(CIO, 3, struct comedi_chaninfo_struct)
#define COMEDI_TRIG _IOWR(CIO, 4, comedi_trig)
#define COMEDI_LOCK _IO(CIO, 5)
#define COMEDI_UNLOCK _IO(CIO, 6)
@@ -365,7 +365,7 @@ struct comedi_cmd {
unsigned int data_len;
};
-struct comedi_chaninfo {
+struct comedi_chaninfo_struct {
unsigned int subdev;
unsigned int *maxdata_list;
unsigned int *flaglist;
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 19dce2e..c356f19 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -75,7 +75,7 @@ static int do_devinfo_ioctl(struct comedi_device *dev, struct comedi_devinfo *ar
struct file *file);
static int do_subdinfo_ioctl(struct comedi_device *dev, struct comedi_subdinfo *arg,
void *file);
-static int do_chaninfo_ioctl(struct comedi_device *dev, struct comedi_chaninfo *arg);
+static int do_chaninfo_ioctl(struct comedi_device *dev, struct comedi_chaninfo_struct *arg);
static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg);
static int do_cmd_ioctl(struct comedi_device *dev, void *arg, void *file);
static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg, void *file);
@@ -490,12 +490,12 @@ static int do_subdinfo_ioctl(struct comedi_device *dev, struct comedi_subdinfo *
arrays at elements of chaninfo structure
*/
-static int do_chaninfo_ioctl(struct comedi_device *dev, struct comedi_chaninfo *arg)
+static int do_chaninfo_ioctl(struct comedi_device *dev, struct comedi_chaninfo_struct *arg)
{
struct comedi_subdevice *s;
- struct comedi_chaninfo it;
+ struct comedi_chaninfo_struct it;
- if (copy_from_user(&it, arg, sizeof(struct comedi_chaninfo)))
+ if (copy_from_user(&it, arg, sizeof(struct comedi_chaninfo_struct)))
return -EFAULT;
if (it.subdev >= dev->n_subdevices)
--
1.6.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Staging: comedi: Fix build problem
2009-03-20 16:36 [PATCH] Staging: comedi: Fix build problem Alessio Igor Bogani
@ 2009-03-21 4:36 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2009-03-21 4:36 UTC (permalink / raw)
To: Alessio Igor Bogani; +Cc: Linux-next
On Fri, Mar 20, 2009 at 05:36:50PM +0100, Alessio Igor Bogani wrote:
> [...]
> CC [M] drivers/staging/comedi/comedi_compat32.o
> drivers/staging/comedi/comedi_compat32.c: In function ‘compat_chaninfo’:
> drivers/staging/comedi/comedi_compat32.c:135: error: dereferencing pointer to incomplete type
> drivers/staging/comedi/comedi_compat32.c:139: error: dereferencing pointer to incomplete type
> drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
> drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
> drivers/staging/comedi/comedi_compat32.c:145: warning: type defaults to ‘int’ in declaration of ‘type name’
> drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
> drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
> drivers/staging/comedi/comedi_compat32.c:145: warning: type defaults to ‘int’ in declaration of ‘type name’
> drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
> drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
> drivers/staging/comedi/comedi_compat32.c:145: warning: type defaults to ‘int’ in declaration of ‘type name’
> drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
> drivers/staging/comedi/comedi_compat32.c:145: error: dereferencing pointer to incomplete type
> [...]
>
> Signed-off-by: Alessio Igor Bogani <abogani@texware•it>
> ---
> drivers/staging/comedi/comedi.h | 4 ++--
> drivers/staging/comedi/comedi_fops.c | 8 ++++----
> 2 files changed, 6 insertions(+), 6 deletions(-)
Hm, I just fixed this in a cleaner way, and copied you on that patch.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-03-21 4:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-20 16:36 [PATCH] Staging: comedi: Fix build problem Alessio Igor Bogani
2009-03-21 4:36 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox