[PATCH] (linux-next) Cleanups in drivers/staging/comedi

[PATCH] (linux-next) Cleanups in drivers/staging/comedi

[Gerard Lledo]

These are 2 small patches that fix one warning and a build faulure in the
comedi subsystem.  Both of them were build-tested.

[PATCH] Staging: comedi: Add missing includes

[Gerard Lledo]

Fixes build errors due to missing includes

Signed-off-by: Gerard Lledo <gerard.lledo@gmail.com>
---
 drivers/staging/comedi/comedidev.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 7a1ccde..1cdf5aa 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -38,6 +38,9 @@
 #include <linux/dma-mapping.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <linux/delay.h>
+#include <linux/jiffies.h>
+#include <linux/timer.h>
 
 #include "comedi.h"
 
-- 
1.5.6.5

[PATCH] Staging: comedi: Fix build warning (type mismatch)

[Gerard Lledo]

spin_lock_irqsave expects flags to be unsigned long, not unsigned int.

Signed-off-by: Gerard Lledo <gerard.lledo@gmail.com>
---
 drivers/staging/comedi/drivers/cb_pcidas.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 28212ad..702de15 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -1593,7 +1593,7 @@ static void handle_ao_interrupt(struct comedi_device *dev, unsigned int status)
 	struct comedi_cmd *cmd = &async->cmd;
 	unsigned int half_fifo = thisboard->fifo_size / 2;
 	unsigned int num_points;
-	unsigned int flags;
+	unsigned long flags;
 
 	async->events = 0;
 
-- 
1.5.6.5

Re: [PATCH] (linux-next) Cleanups in drivers/staging/comedi

[Frederic Weisbecker]

On Wed, May 27, 2009 at 05:35:17PM +0300, Gerard Lledo wrote:
> 
> These are 2 small patches that fix one warning and a build faulure in the
> comedi subsystem.  Both of them were build-tested.


Hi,

Don't forget to Cc linux-kernel and also Greg who is
the staging subsystem maintainer.

(adding the missing Cc)

Thanks.



> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] (linux-next) Cleanups in drivers/staging/comedi

[Greg KH]

On Wed, May 27, 2009 at 05:03:13PM +0200, Frederic Weisbecker wrote:
> On Wed, May 27, 2009 at 05:35:17PM +0300, Gerard Lledo wrote:
> > 
> > These are 2 small patches that fix one warning and a build faulure in the
> > comedi subsystem.  Both of them were build-tested.
> 
> 
> Hi,
> 
> Don't forget to Cc linux-kernel and also Greg who is
> the staging subsystem maintainer.
> 
> (adding the missing Cc)

My scripts caught them, they are now in my ever-growing "to-apply"
queue.

thanks,

greg k-h

Re: [PATCH] Staging: comedi: Add missing includes

[Greg KH]

On Wed, May 27, 2009 at 05:35:18PM +0300, Gerard Lledo wrote:
> Fixes build errors due to missing includes
> 
> Signed-off-by: Gerard Lledo <gerard.lledo@gmail.com>

This should now be fixed up already.

thanks,

greg k-h