[PATCH 1/2] Staging: comedi: Coding style issues

[PATCH 1/2] Staging: comedi: Coding style issues

[markpearson_de]

From: Mark Pearson <markpearson_de@yahoo.de>

comedi.h : static inline decleration placed on the same line as the end
           bracket from the previous static inline decleration.
           Bracket coding issue also cleaned-up.

Signed-off-by: Mark Pearson <markpearson_de@yahoo.de>
---
 drivers/staging/comedi/comedi.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index 6c900e2..ed6854c 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -514,7 +514,9 @@
 			return 0x1 + pfi_channel;
 		else
 			return 0xb + pfi_channel;
-	} static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel) {
+	}
+	static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel)
+	{
 		if (rtsi_channel < 7)
 			return 0xb + rtsi_channel;
 		else
-- 
1.7.0.4

[PATCH 2/2] Staging: comedi: Fixed coding style issues.

[markpearson_de]

From: Mark Pearson <markpearson_de@yahoo.de>

comedi_fops.c : A forward decleration was declared as extern although it
                is a function private to this file. Changed the
                decleration to static.

Signed-off-by: Mark Pearson <markpearson_de@yahoo.de>
---
 drivers/staging/comedi/comedi_fops.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index e7e72b8..88d7a0a 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -101,7 +101,7 @@ static int do_insn_ioctl(struct comedi_device *dev,
 static int do_poll_ioctl(struct comedi_device *dev, unsigned int subd,
 			 void *file);
 
-extern void do_become_nonbusy(struct comedi_device *dev,
+static void do_become_nonbusy(struct comedi_device *dev,
 			      struct comedi_subdevice *s);
 static int do_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
 
-- 
1.7.0.4

Re: [PATCH 1/2] Staging: comedi: Coding style issues

[Greg KH]

On Sun, Jul 10, 2011 at 09:16:37PM +0200, markpearson_de@yahoo.de wrote:
> From: Mark Pearson <markpearson_de@yahoo.de>
> 
> comedi.h : static inline decleration placed on the same line as the end
>            bracket from the previous static inline decleration.
>            Bracket coding issue also cleaned-up.
> 
> Signed-off-by: Mark Pearson <markpearson_de@yahoo.de>
> ---
>  drivers/staging/comedi/comedi.h |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
> index 6c900e2..ed6854c 100644
> --- a/drivers/staging/comedi/comedi.h
> +++ b/drivers/staging/comedi/comedi.h
> @@ -514,7 +514,9 @@
>  			return 0x1 + pfi_channel;
>  		else
>  			return 0xb + pfi_channel;
> -	} static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel) {
> +	}
> +	static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel)
> +	{

This patch does not apply anymore to 3.1-rc3, care to resend?

thanks,

greg k-h