Skip to content

Commit

Permalink
staging: comedi: amplc_pci230: Replace NULLFUNC
Browse files Browse the repository at this point in the history
The source code defines a macro NULLFUNC

  #define NULLFUNC 0

and uses it as a generic null function pointer constant.  This is
superfluous.  Just use NULL instead.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Jun 11, 2012
1 parent f59f231 commit 83afda9
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/staging/comedi/drivers/amplc_pci230.c
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,6 @@ enum {
/* Combine old and new bits. */
#define COMBINE(old, new, mask) (((old) & ~(mask)) | ((new) & (mask)))

/* A generic null function pointer value. */
#define NULLFUNC 0

/* Current CPU. XXX should this be hard_smp_processor_id()? */
#define THISCPU smp_processor_id()

Expand Down Expand Up @@ -1491,7 +1488,7 @@ static int pci230_ao_inttrig_start(struct comedi_device *dev,
if (trig_num != 0)
return -EINVAL;

s->async->inttrig = NULLFUNC;
s->async->inttrig = NULL;
pci230_ao_start(dev, s);

return 1;
Expand Down Expand Up @@ -2292,7 +2289,7 @@ static int pci230_ai_inttrig_start(struct comedi_device *dev,
if (trig_num != 0)
return -EINVAL;

s->async->inttrig = NULLFUNC;
s->async->inttrig = NULL;
pci230_ai_start(dev, s);

return 1;
Expand Down

0 comments on commit 83afda9

Please sign in to comment.