From: Ian Abbott Date: Wed, 3 Sep 2014 12:45:43 +0000 (+0100) Subject: staging: comedi: add CMDF_BOGUS as synonym for TRIG_BOGUS X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=dd7eb1251d3c99136e60d9d0e325ca40e03f89bc;p=deliverable%2Flinux.git staging: comedi: add CMDF_BOGUS as synonym for TRIG_BOGUS `TRIG_BOGUS` is one of the values that can be OR-ed into the `flags` member of `struct comedi_cmd`. It causes the comedi core to go through some of the motions of setting up an asynchronous command without actually setting it up. If all goes well, it causes the command set-up to fail with an `EAGAIN` error. The name `TRIG_BOGUS` is a bit of a left-over from earlier times. A better name would be `CMDF_BOGUS` to match various other command flags. Define `CMDF_BOGUS` with the same numeric value as the old `TRIG_BOGUS` and redefine `TRIG_BOGUS` as a synonym of it. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index dfaa935dd784..3d2801d8c520 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -123,7 +123,6 @@ /* trigger flags */ /* These flags are used in comedi_trig structures */ -#define TRIG_BOGUS 0x0001 /* do the motions */ #define TRIG_DITHER 0x0002 /* enable dithering */ #define TRIG_DEGLITCH 0x0004 /* enable deglitching */ #define TRIG_CONFIG 0x0010 /* perform configuration, not triggering */ @@ -131,6 +130,8 @@ /* command flags */ /* These flags are used in comedi_cmd structures */ +#define CMDF_BOGUS 0x00000001 /* do the motions */ + /* try to use a real-time interrupt while performing command */ #define CMDF_PRIORITY 0x00000008 @@ -154,6 +155,7 @@ #define TRIG_ROUND_UP_NEXT 0x00030000 /* compatibility definitions */ +#define TRIG_BOGUS CMDF_BOGUS #define TRIG_RT CMDF_PRIORITY #define TRIG_WAKE_EOS CMDF_WAKE_EOS #define TRIG_WRITE CMDF_WRITE