From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 8 Jun 2012 09:39:42 +0000 (+0100)
Subject: staging: comedi: amplc_pci224: Replace NULLFUNC
X-Git-Tag: firefly_0821_release~3680^2~2356^2~863
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cbdfaffc461fd3df12f494655aca5cae68d6c7aa;p=firefly-linux-kernel-4.4.55.git

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: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index 43f07f8f365e..a1e23bafabea 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -265,9 +265,6 @@ Caveats:
 /* 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()
 
@@ -703,7 +700,7 @@ pci224_ao_inttrig_start(struct comedi_device *dev, struct comedi_subdevice *s,
 	if (trignum != 0)
 		return -EINVAL;
 
-	s->async->inttrig = NULLFUNC;
+	s->async->inttrig = NULL;
 	pci224_ao_start(dev, s);
 
 	return 1;