* [PATCH 1/2] Staging: comedi: Coding style issues
@ 2011-07-10 19:16 markpearson_de
2011-07-10 19:16 ` [PATCH 2/2] Staging: comedi: Fixed coding " markpearson_de
2011-08-23 18:56 ` [PATCH 1/2] Staging: comedi: Coding " Greg KH
0 siblings, 2 replies; 3+ messages in thread
From: markpearson_de @ 2011-07-10 19:16 UTC (permalink / raw)
To: greg; +Cc: abbotti, fmhess, devel, linux-kernel, Mark Pearson
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] Staging: comedi: Fixed coding style issues.
2011-07-10 19:16 [PATCH 1/2] Staging: comedi: Coding style issues markpearson_de
@ 2011-07-10 19:16 ` markpearson_de
2011-08-23 18:56 ` [PATCH 1/2] Staging: comedi: Coding " Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: markpearson_de @ 2011-07-10 19:16 UTC (permalink / raw)
To: greg; +Cc: abbotti, fmhess, devel, linux-kernel, Mark Pearson
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] Staging: comedi: Coding style issues
2011-07-10 19:16 [PATCH 1/2] Staging: comedi: Coding style issues markpearson_de
2011-07-10 19:16 ` [PATCH 2/2] Staging: comedi: Fixed coding " markpearson_de
@ 2011-08-23 18:56 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2011-08-23 18:56 UTC (permalink / raw)
To: markpearson_de; +Cc: abbotti, fmhess, devel, linux-kernel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-23 19:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-10 19:16 [PATCH 1/2] Staging: comedi: Coding style issues markpearson_de
2011-07-10 19:16 ` [PATCH 2/2] Staging: comedi: Fixed coding " markpearson_de
2011-08-23 18:56 ` [PATCH 1/2] Staging: comedi: Coding " Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.