Skip to content

Commit

Permalink
Staging: comedi: Change "foo * bar" to "foo *bar"
Browse files Browse the repository at this point in the history 
Removes checkpatch.pl errors

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent b6c7775 commit e473e91
Show file tree
Hide file tree
Showing 13 changed files with 390 additions and 390 deletions.
68 changes: 34 additions & 34 deletions drivers/staging/comedi/drivers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
#include <asm/io.h>
#include <asm/system.h>

static int postconfig(comedi_device * dev);
static int insn_rw_emulate_bits(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data);
static int postconfig(comedi_device *dev);
static int insn_rw_emulate_bits(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data);
static void *comedi_recognize(comedi_driver * driv, const char *name);
static void comedi_report_boards(comedi_driver * driv);
static int poll_invalid(comedi_device * dev, comedi_subdevice * s);
int comedi_buf_alloc(comedi_device * dev, comedi_subdevice * s,
static void comedi_report_boards(comedi_driver *driv);
static int poll_invalid(comedi_device *dev, comedi_subdevice *s);
int comedi_buf_alloc(comedi_device *dev, comedi_subdevice *s,
unsigned long new_size);

comedi_driver *comedi_drivers;
Expand All @@ -63,7 +63,7 @@ int comedi_modprobe(int minor)
return -EINVAL;
}

static void cleanup_device(comedi_device * dev)
static void cleanup_device(comedi_device *dev)
{
int i;
comedi_subdevice *s;
Expand Down Expand Up @@ -97,7 +97,7 @@ static void cleanup_device(comedi_device * dev)
comedi_set_hw_dev(dev, NULL);
}

static void __comedi_device_detach(comedi_device * dev)
static void __comedi_device_detach(comedi_device *dev)
{
dev->attached = 0;
if (dev->driver) {
Expand All @@ -108,14 +108,14 @@ static void __comedi_device_detach(comedi_device * dev)
cleanup_device(dev);
}

void comedi_device_detach(comedi_device * dev)
void comedi_device_detach(comedi_device *dev)
{
if (!dev->attached)
return;
__comedi_device_detach(dev);
}

int comedi_device_attach(comedi_device * dev, comedi_devconfig * it)
int comedi_device_attach(comedi_device *dev, comedi_devconfig *it)
{
comedi_driver *driv;
int ret;
Expand Down Expand Up @@ -182,15 +182,15 @@ int comedi_device_attach(comedi_device * dev, comedi_devconfig * it)
return 0;
}

int comedi_driver_register(comedi_driver * driver)
int comedi_driver_register(comedi_driver *driver)
{
driver->next = comedi_drivers;
comedi_drivers = driver;

return 0;
}

int comedi_driver_unregister(comedi_driver * driver)
int comedi_driver_unregister(comedi_driver *driver)
{
comedi_driver *prev;
int i;
Expand Down Expand Up @@ -226,7 +226,7 @@ int comedi_driver_unregister(comedi_driver * driver)
return -EINVAL;
}

static int postconfig(comedi_device * dev)
static int postconfig(comedi_device *dev)
{
int i;
comedi_subdevice *s;
Expand Down Expand Up @@ -315,7 +315,7 @@ void *comedi_recognize(comedi_driver * driv, const char *name)
return NULL;
}

void comedi_report_boards(comedi_driver * driv)
void comedi_report_boards(comedi_driver *driv)
{
unsigned int i;
const char *const *name_ptr;
Expand All @@ -333,19 +333,19 @@ void comedi_report_boards(comedi_driver * driv)
printk(" %s\n", driv->driver_name);
}

static int poll_invalid(comedi_device * dev, comedi_subdevice * s)
static int poll_invalid(comedi_device *dev, comedi_subdevice *s)
{
return -EINVAL;
}

int insn_inval(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data)
int insn_inval(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data)
{
return -EINVAL;
}

static int insn_rw_emulate_bits(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data)
static int insn_rw_emulate_bits(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data)
{
comedi_insn new_insn;
int ret;
Expand Down Expand Up @@ -381,7 +381,7 @@ static int insn_rw_emulate_bits(comedi_device * dev, comedi_subdevice * s,
return 1;
}

static inline unsigned long uvirt_to_kva(pgd_t * pgd, unsigned long adr)
static inline unsigned long uvirt_to_kva(pgd_t *pgd, unsigned long adr)
{
unsigned long ret = 0UL;
pmd_t *pmd;
Expand Down Expand Up @@ -414,7 +414,7 @@ static inline unsigned long kvirt_to_kva(unsigned long adr)
return kva;
}

int comedi_buf_alloc(comedi_device * dev, comedi_subdevice * s,
int comedi_buf_alloc(comedi_device *dev, comedi_subdevice *s,
unsigned long new_size)
{
comedi_async *async = s->async;
Expand Down Expand Up @@ -538,7 +538,7 @@ int comedi_buf_alloc(comedi_device * dev, comedi_subdevice * s,

/* munging is applied to data by core as it passes between user
* and kernel space */
unsigned int comedi_buf_munge(comedi_async * async, unsigned int num_bytes)
unsigned int comedi_buf_munge(comedi_async *async, unsigned int num_bytes)
{
comedi_subdevice *s = async->subdevice;
unsigned int count = 0;
Expand Down Expand Up @@ -582,7 +582,7 @@ unsigned int comedi_buf_munge(comedi_async * async, unsigned int num_bytes)
return count;
}

unsigned int comedi_buf_write_n_available(comedi_async * async)
unsigned int comedi_buf_write_n_available(comedi_async *async)
{
unsigned int free_end;
unsigned int nbytes;
Expand All @@ -602,7 +602,7 @@ unsigned int comedi_buf_write_n_available(comedi_async * async)
}

/* allocates chunk for the writer from free buffer space */
unsigned int comedi_buf_write_alloc(comedi_async * async, unsigned int nbytes)
unsigned int comedi_buf_write_alloc(comedi_async *async, unsigned int nbytes)
{
unsigned int free_end = async->buf_read_count + async->prealloc_bufsz;

Expand All @@ -617,7 +617,7 @@ unsigned int comedi_buf_write_alloc(comedi_async * async, unsigned int nbytes)
}

/* allocates nothing unless it can completely fulfill the request */
unsigned int comedi_buf_write_alloc_strict(comedi_async * async,
unsigned int comedi_buf_write_alloc_strict(comedi_async *async,
unsigned int nbytes)
{
unsigned int free_end = async->buf_read_count + async->prealloc_bufsz;
Expand All @@ -633,7 +633,7 @@ unsigned int comedi_buf_write_alloc_strict(comedi_async * async,
}

/* transfers a chunk from writer to filled buffer space */
unsigned comedi_buf_write_free(comedi_async * async, unsigned int nbytes)
unsigned comedi_buf_write_free(comedi_async *async, unsigned int nbytes)
{
if ((int)(async->buf_write_count + nbytes -
async->buf_write_alloc_count) > 0) {
Expand All @@ -651,7 +651,7 @@ unsigned comedi_buf_write_free(comedi_async * async, unsigned int nbytes)
}

/* allocates a chunk for the reader from filled (and munged) buffer space */
unsigned comedi_buf_read_alloc(comedi_async * async, unsigned nbytes)
unsigned comedi_buf_read_alloc(comedi_async *async, unsigned nbytes)
{
if ((int)(async->buf_read_alloc_count + nbytes - async->munge_count) >
0) {
Expand All @@ -665,7 +665,7 @@ unsigned comedi_buf_read_alloc(comedi_async * async, unsigned nbytes)
}

/* transfers control of a chunk from reader to free buffer space */
unsigned comedi_buf_read_free(comedi_async * async, unsigned int nbytes)
unsigned comedi_buf_read_free(comedi_async *async, unsigned int nbytes)
{
/* barrier insures data has been read out of buffer before read count is incremented */
smp_mb();
Expand All @@ -681,7 +681,7 @@ unsigned comedi_buf_read_free(comedi_async * async, unsigned int nbytes)
return nbytes;
}

void comedi_buf_memcpy_to(comedi_async * async, unsigned int offset,
void comedi_buf_memcpy_to(comedi_async *async, unsigned int offset,
const void *data, unsigned int num_bytes)
{
unsigned int write_ptr = async->buf_write_ptr + offset;
Expand All @@ -706,7 +706,7 @@ void comedi_buf_memcpy_to(comedi_async * async, unsigned int offset,
}
}

void comedi_buf_memcpy_from(comedi_async * async, unsigned int offset,
void comedi_buf_memcpy_from(comedi_async *async, unsigned int offset,
void *dest, unsigned int nbytes)
{
void *src;
Expand All @@ -732,7 +732,7 @@ void comedi_buf_memcpy_from(comedi_async * async, unsigned int offset,
}
}

unsigned int comedi_buf_read_n_available(comedi_async * async)
unsigned int comedi_buf_read_n_available(comedi_async *async)
{
unsigned num_bytes;

Expand All @@ -747,7 +747,7 @@ unsigned int comedi_buf_read_n_available(comedi_async * async)
return num_bytes;
}

int comedi_buf_get(comedi_async * async, sampl_t * x)
int comedi_buf_get(comedi_async *async, sampl_t *x)
{
unsigned int n = comedi_buf_read_n_available(async);

Expand All @@ -759,7 +759,7 @@ int comedi_buf_get(comedi_async * async, sampl_t * x)
return 1;
}

int comedi_buf_put(comedi_async * async, sampl_t x)
int comedi_buf_put(comedi_async *async, sampl_t x)
{
unsigned int n = comedi_buf_write_alloc_strict(async, sizeof(sampl_t));

Expand All @@ -772,7 +772,7 @@ int comedi_buf_put(comedi_async * async, sampl_t x)
return 1;
}

void comedi_reset_async_buf(comedi_async * async)
void comedi_reset_async_buf(comedi_async *async)
{
async->buf_write_alloc_count = 0;
async->buf_write_count = 0;
Expand Down
48 changes: 24 additions & 24 deletions drivers/staging/comedi/drivers/icp_multi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ static const char range_codes_analog[] = { 0x00, 0x20, 0x10, 0x30 };
Forward declarations
==============================================================================
*/
static int icp_multi_attach(comedi_device * dev, comedi_devconfig * it);
static int icp_multi_detach(comedi_device * dev);
static int icp_multi_attach(comedi_device *dev, comedi_devconfig *it);
static int icp_multi_detach(comedi_device *dev);

/*
==============================================================================
Expand Down Expand Up @@ -214,12 +214,12 @@ typedef struct {
*/

#if 0
static int check_channel_list(comedi_device * dev, comedi_subdevice * s,
static int check_channel_list(comedi_device *dev, comedi_subdevice *s,
unsigned int *chanlist, unsigned int n_chan);
#endif
static void setup_channel_list(comedi_device * dev, comedi_subdevice * s,
static void setup_channel_list(comedi_device *dev, comedi_subdevice *s,
unsigned int *chanlist, unsigned int n_chan);
static int icp_multi_reset(comedi_device * dev);
static int icp_multi_reset(comedi_device *dev);

/*
==============================================================================
Expand All @@ -245,8 +245,8 @@ static int icp_multi_reset(comedi_device * dev);
==============================================================================
*/
static int icp_multi_insn_read_ai(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data)
static int icp_multi_insn_read_ai(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data)
{
int n, timeout;

Expand Down Expand Up @@ -364,8 +364,8 @@ static int icp_multi_insn_read_ai(comedi_device * dev, comedi_subdevice * s,
==============================================================================
*/
static int icp_multi_insn_write_ao(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data)
static int icp_multi_insn_write_ao(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data)
{
int n, chan, range, timeout;

Expand Down Expand Up @@ -472,8 +472,8 @@ static int icp_multi_insn_write_ao(comedi_device * dev, comedi_subdevice * s,
==============================================================================
*/
static int icp_multi_insn_read_ao(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data)
static int icp_multi_insn_read_ao(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data)
{
int n, chan;

Expand Down Expand Up @@ -505,8 +505,8 @@ static int icp_multi_insn_read_ao(comedi_device * dev, comedi_subdevice * s,
==============================================================================
*/
static int icp_multi_insn_bits_di(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data)
static int icp_multi_insn_bits_di(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data)
{
data[1] = readw(devpriv->io_addr + ICP_MULTI_DI);

Expand All @@ -531,8 +531,8 @@ static int icp_multi_insn_bits_di(comedi_device * dev, comedi_subdevice * s,
==============================================================================
*/
static int icp_multi_insn_bits_do(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data)
static int icp_multi_insn_bits_do(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data)
{
#ifdef ICP_MULTI_EXTDEBUG
printk("icp multi EDBG: BGN: icp_multi_insn_bits_do(...)\n");
Expand Down Expand Up @@ -573,8 +573,8 @@ static int icp_multi_insn_bits_do(comedi_device * dev, comedi_subdevice * s,
==============================================================================
*/
static int icp_multi_insn_read_ctr(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data)
static int icp_multi_insn_read_ctr(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data)
{
return 0;
}
Expand All @@ -597,8 +597,8 @@ static int icp_multi_insn_read_ctr(comedi_device * dev, comedi_subdevice * s,
==============================================================================
*/
static int icp_multi_insn_write_ctr(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data)
static int icp_multi_insn_write_ctr(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data)
{
return 0;
}
Expand Down Expand Up @@ -689,7 +689,7 @@ static irqreturn_t interrupt_service_icp_multi(int irq, void *d PT_REGS_ARG)
==============================================================================
*/
static int check_channel_list(comedi_device * dev, comedi_subdevice * s,
static int check_channel_list(comedi_device *dev, comedi_subdevice *s,
unsigned int *chanlist, unsigned int n_chan)
{
unsigned int i;
Expand Down Expand Up @@ -743,7 +743,7 @@ static int check_channel_list(comedi_device * dev, comedi_subdevice * s,
==============================================================================
*/
static void setup_channel_list(comedi_device * dev, comedi_subdevice * s,
static void setup_channel_list(comedi_device *dev, comedi_subdevice *s,
unsigned int *chanlist, unsigned int n_chan)
{
unsigned int i, range, chanprog;
Expand Down Expand Up @@ -812,7 +812,7 @@ static void setup_channel_list(comedi_device * dev, comedi_subdevice * s,
==============================================================================
*/
static int icp_multi_reset(comedi_device * dev)
static int icp_multi_reset(comedi_device *dev)
{
unsigned int i;

Expand Down Expand Up @@ -870,7 +870,7 @@ static int icp_multi_reset(comedi_device * dev)
==============================================================================
*/
static int icp_multi_attach(comedi_device * dev, comedi_devconfig * it)
static int icp_multi_attach(comedi_device *dev, comedi_devconfig *it)
{
comedi_subdevice *s;
int ret, subdev, n_subdevices;
Expand Down Expand Up @@ -1061,7 +1061,7 @@ static int icp_multi_attach(comedi_device * dev, comedi_devconfig * it)
==============================================================================
*/
static int icp_multi_detach(comedi_device * dev)
static int icp_multi_detach(comedi_device *dev)
{

if (dev->private)
Expand Down
Loading

0 comments on commit e473e91

Please sign in to comment.