Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbdfaffc authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: amplc_pci224: Replace NULLFUNC 



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: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 83afda9d

drivers/staging/comedi/drivers/amplc_pci224.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -265,9 +265,6 @@ Caveats: 
/* Combine old and new bits. */

/* Combine old and new bits. */

#define COMBINE(old, new, mask)	(((old) & ~(mask)) | ((new) & (mask)))

#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()? */

/* Current CPU.  XXX should this be hard_smp_processor_id()? */

#define THISCPU		smp_processor_id()

#define THISCPU		smp_processor_id()
@@ -703,7 +700,7 @@ pci224_ao_inttrig_start(struct comedi_device *dev, struct comedi_subdevice *s, 
	if (trignum != 0)

	if (trignum != 0)

		return -EINVAL;

		return -EINVAL;





	s->async->inttrig = NULLFUNC;

	s->async->inttrig = NULL;

	pci224_ao_start(dev, s);

	pci224_ao_start(dev, s);





	return 1;

	return 1;