* [PATCH] Staging: comedi: comedidev.h Fixed whitespace coding style warnings
@ 2014-03-09 0:45 Nick Davies
2014-03-09 3:01 ` Greg KH
2014-03-09 6:45 ` Greg KH
0 siblings, 2 replies; 3+ messages in thread
From: Nick Davies @ 2014-03-09 0:45 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Nick Davies
Fixed coding style warnings in comedidev.h which had an extra space
after the function pointer name.
Signed-off-by: Nick Davies <git@nicolasdavies.com.au>
---
drivers/staging/comedi/comedidev.h | 48 +++++++++++++++++++-------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index f82bd42..6ad4387 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -61,31 +61,31 @@ struct comedi_subdevice {
unsigned int *chanlist; /* driver-owned chanlist (not used) */
- int (*insn_read) (struct comedi_device *, struct comedi_subdevice *,
+ int (*insn_read)(struct comedi_device *, struct comedi_subdevice *,
+ struct comedi_insn *, unsigned int *);
+ int (*insn_write)(struct comedi_device *, struct comedi_subdevice *,
struct comedi_insn *, unsigned int *);
- int (*insn_write) (struct comedi_device *, struct comedi_subdevice *,
+ int (*insn_bits)(struct comedi_device *, struct comedi_subdevice *,
+ struct comedi_insn *, unsigned int *);
+ int (*insn_config)(struct comedi_device *, struct comedi_subdevice *,
struct comedi_insn *, unsigned int *);
- int (*insn_bits) (struct comedi_device *, struct comedi_subdevice *,
- struct comedi_insn *, unsigned int *);
- int (*insn_config) (struct comedi_device *, struct comedi_subdevice *,
- struct comedi_insn *, unsigned int *);
-
- int (*do_cmd) (struct comedi_device *, struct comedi_subdevice *);
- int (*do_cmdtest) (struct comedi_device *, struct comedi_subdevice *,
- struct comedi_cmd *);
- int (*poll) (struct comedi_device *, struct comedi_subdevice *);
- int (*cancel) (struct comedi_device *, struct comedi_subdevice *);
+
+ int (*do_cmd)(struct comedi_device *, struct comedi_subdevice *);
+ int (*do_cmdtest)(struct comedi_device *, struct comedi_subdevice *,
+ struct comedi_cmd *);
+ int (*poll)(struct comedi_device *, struct comedi_subdevice *);
+ int (*cancel)(struct comedi_device *, struct comedi_subdevice *);
/* int (*do_lock)(struct comedi_device *, struct comedi_subdevice *); */
/* int (*do_unlock)(struct comedi_device *, \
struct comedi_subdevice *); */
/* called when the buffer changes */
- int (*buf_change) (struct comedi_device *dev,
- struct comedi_subdevice *s, unsigned long new_size);
+ int (*buf_change)(struct comedi_device *dev,
+ struct comedi_subdevice *s, unsigned long new_size);
- void (*munge) (struct comedi_device *dev, struct comedi_subdevice *s,
- void *data, unsigned int num_bytes,
- unsigned int start_chan_index);
+ void (*munge)(struct comedi_device *dev, struct comedi_subdevice *s,
+ void *data, unsigned int num_bytes,
+ unsigned int start_chan_index);
enum dma_data_direction async_dma_dir;
unsigned int state;
@@ -146,8 +146,8 @@ struct comedi_async {
unsigned int cb_mask;
- int (*inttrig) (struct comedi_device *dev, struct comedi_subdevice *s,
- unsigned int x);
+ int (*inttrig)(struct comedi_device *dev, struct comedi_subdevice *s,
+ unsigned int x);
};
struct comedi_driver {
@@ -155,9 +155,9 @@ struct comedi_driver {
const char *driver_name;
struct module *module;
- int (*attach) (struct comedi_device *, struct comedi_devconfig *);
- void (*detach) (struct comedi_device *);
- int (*auto_attach) (struct comedi_device *, unsigned long);
+ int (*attach)(struct comedi_device *, struct comedi_devconfig *);
+ void (*detach)(struct comedi_device *);
+ int (*auto_attach)(struct comedi_device *, unsigned long);
/* number of elements in board_name and board_id arrays */
unsigned int num_names;
@@ -202,8 +202,8 @@ struct comedi_device {
struct fasync_struct *async_queue;
- int (*open) (struct comedi_device *dev);
- void (*close) (struct comedi_device *dev);
+ int (*open)(struct comedi_device *dev);
+ void (*close)(struct comedi_device *dev);
};
static inline const void *comedi_board(const struct comedi_device *dev)
--
1.8.5.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Staging: comedi: comedidev.h Fixed whitespace coding style warnings
2014-03-09 0:45 [PATCH] Staging: comedi: comedidev.h Fixed whitespace coding style warnings Nick Davies
@ 2014-03-09 3:01 ` Greg KH
2014-03-09 6:45 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2014-03-09 3:01 UTC (permalink / raw)
To: Nick Davies; +Cc: devel, linux-kernel
On Sun, Mar 09, 2014 at 11:45:51AM +1100, Nick Davies wrote:
> Fixed coding style warnings in comedidev.h which had an extra space
> after the function pointer name.
>
> Signed-off-by: Nick Davies <git@nicolasdavies.com.au>
> ---
> drivers/staging/comedi/comedidev.h | 48 +++++++++++++++++++-------------------
> 1 file changed, 24 insertions(+), 24 deletions(-)
This has already been cleaned up in my tree, be sure to always work off
of the linux-next tree when doing staging tree cleanups to avoid
duplicate work.
thanks
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Staging: comedi: comedidev.h Fixed whitespace coding style warnings
2014-03-09 0:45 [PATCH] Staging: comedi: comedidev.h Fixed whitespace coding style warnings Nick Davies
2014-03-09 3:01 ` Greg KH
@ 2014-03-09 6:45 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2014-03-09 6:45 UTC (permalink / raw)
To: Nick Davies; +Cc: devel, linux-kernel
On Sun, Mar 09, 2014 at 11:45:51AM +1100, Nick Davies wrote:
> Fixed coding style warnings in comedidev.h which had an extra space
> after the function pointer name.
>
> Signed-off-by: Nick Davies <git@nicolasdavies.com.au>
> ---
> drivers/staging/comedi/comedidev.h | 48 +++++++++++++++++++-------------------
> 1 file changed, 24 insertions(+), 24 deletions(-)
This patch doesn't apply to my tree, care to refresh it and resend?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-09 6:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-09 0:45 [PATCH] Staging: comedi: comedidev.h Fixed whitespace coding style warnings Nick Davies
2014-03-09 3:01 ` Greg KH
2014-03-09 6:45 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox