Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754511AbcCBO2J (ORCPT ); Wed, 2 Mar 2016 09:28:09 -0500 Received: from smtp73.iad3a.emailsrvr.com ([173.203.187.73]:56240 "EHLO smtp73.iad3a.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754295AbcCBO1u (ORCPT ); Wed, 2 Mar 2016 09:27:50 -0500 X-Auth-ID: abbotti@mev.co.uk X-Sender-Id: abbotti@mev.co.uk From: Ian Abbott To: devel@driverdev.osuosl.org Cc: Greg Kroah-Hartman , Ian Abbott , H Hartley Sweeten , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] staging: comedi: comedi.h: Do not use BIT macro Date: Wed, 2 Mar 2016 14:27:37 +0000 Message-Id: <1456928858-6014-2-git-send-email-abbotti@mev.co.uk> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456928858-6014-1-git-send-email-abbotti@mev.co.uk> References: <1456928858-6014-1-git-send-email-abbotti@mev.co.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1563 Lines: 46 The "comedi.h" file is part of the user API for COMEDI devices, and is intended to be migrated to "include/uapi/linux". The `BIT` macro from "include/linux/bitops.h" should not be used there. Replace the use of the `BIT` macro with hexadecimal constants of the same value. The `BIT` macro replaced expressions of the form `(1 << N)` in this file originally, but reverting back to that form would encourage patches changing them back to use the `BIT` macro. Signed-off-by: Ian Abbott --- drivers/staging/comedi/comedi.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index f1415cb..9547324 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -72,12 +72,12 @@ #define CR_AREF(a) (((a) >> 24) & 0x03) #define CR_FLAGS_MASK 0xfc000000 -#define CR_ALT_FILTER BIT(26) +#define CR_ALT_FILTER 0x04000000 #define CR_DITHER CR_ALT_FILTER #define CR_DEGLITCH CR_ALT_FILTER -#define CR_ALT_SOURCE BIT(27) -#define CR_EDGE BIT(30) -#define CR_INVERT BIT(31) +#define CR_ALT_SOURCE 0x08000000 +#define CR_EDGE 0x40000000 +#define CR_INVERT 0x80000000 #define AREF_GROUND 0x00 /* analog ref = analog ground */ #define AREF_COMMON 0x01 /* analog ref = analog common */ @@ -894,7 +894,7 @@ struct comedi_bufinfo { #define RANGE_LENGTH(b) ((b) & 0xffff) #define RF_UNIT(flags) ((flags) & 0xff) -#define RF_EXTERNAL BIT(8) +#define RF_EXTERNAL 0x100 #define UNIT_volt 0 #define UNIT_mA 1 -- 2.7.0