From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751958AbcEQRmi (ORCPT ); Tue, 17 May 2016 13:42:38 -0400 Received: from mail-bn1bbn0108.outbound.protection.outlook.com ([157.56.111.108]:61856 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750940AbcEQRmh convert rfc822-to-8bit (ORCPT ); Tue, 17 May 2016 13:42:37 -0400 X-Greylist: delayed 900 seconds by postgrey-1.27 at vger.kernel.org; Tue, 17 May 2016 13:42:37 EDT From: Hartley Sweeten To: Ian Abbott , "devel@driverdev.osuosl.org" CC: Greg Kroah-Hartman , "linux-kernel@vger.kernel.org" Subject: RE: [PATCH 06/14] staging: comedi: daqboard2000: rename register offset macros Thread-Topic: [PATCH 06/14] staging: comedi: daqboard2000: rename register offset macros Thread-Index: AQHRsCHzZLfx4TON/ECsabpRXoKvzJ+9YXcA Date: Tue, 17 May 2016 17:27:29 +0000 Message-ID: References: <1463478773-5916-1-git-send-email-abbotti@mev.co.uk> <1463478773-5916-7-git-send-email-abbotti@mev.co.uk> In-Reply-To: <1463478773-5916-7-git-send-email-abbotti@mev.co.uk> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: mev.co.uk; dkim=none (message not signed) header.d=none;mev.co.uk; dmarc=none action=none header.from=visionengravers.com; x-originating-ip: [184.183.19.121] x-ms-office365-filtering-correlation-id: 71365fdb-3595-4421-442c-08d37e7885d9 x-microsoft-exchange-diagnostics: 1;CO2PR01MB2085;5:JWLjuHeP/q0+bxKqqK0Er3WV9dwCuAwi0cqH/UPHWn4+p7Vo+ebHj6nWF6CxHa/SYIga+2pomy+Ao32EsCBwXQ+IVJXa0S4tLMmzc86Ows5OJ7OUHdF8JVb6xDWnw+sYU5uX/jdkI38HiT2H8jKCiQ==;24:4IwGj5LZjW6mrf69efZIuesvyj8+bSKdcVlE7/EukdQiYLeVkMKDp1OjJkt3n382WEC7Rs/0iJILUh3piYpmPTUAGhhhfXgiK1JoDino8MI=;7:iWxm/lPJbaZqLnYN7NRzdFbFkL10++5sOtt/WgEPNHKs1wwKcF63VW2ZvSWycs/XfQQ34fpTa88LLeRmPb4gyP12xiRbbMC6PqeCPwCuGrlOHf5nPPSNpt88K/TEvNhCeIFxS/wFkWd0hifLlPk2jfkQLkVbU/LdjwLtfupqV8NFNhKMVwLPu79seasWj2Dp x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR01MB2085; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040130)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041072)(6043046);SRVR:CO2PR01MB2085;BCL:0;PCL:0;RULEID:;SRVR:CO2PR01MB2085; x-forefront-prvs: 0945B0CC72 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(377454003)(24454002)(74316001)(19580395003)(19580405001)(33656002)(10400500002)(2950100001)(2900100001)(106116001)(9686002)(5003600100002)(5001770100001)(2906002)(8936002)(77096005)(8676002)(92566002)(81166006)(5004730100002)(1220700001)(4326007)(5002640100001)(5008740100001)(189998001)(87936001)(102836003)(586003)(6116002)(2501003)(3846002)(575784001)(86362001)(122556002)(11100500001)(80792005)(66066001)(54356999)(50986999)(76176999);DIR:OUT;SFP:1102;SCL:1;SRVR:CO2PR01MB2085;H:CO2PR01MB2088.prod.exchangelabs.com;FPR:;SPF:None;MLV:sfv;LANG:en; spamdiagnosticoutput: 1:23 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-OriginatorOrg: visionengravers.com X-MS-Exchange-CrossTenant-originalarrivaltime: 17 May 2016 17:27:29.3656 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d698601f-af92-4269-8099-fd6f11636477 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR01MB2085 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tuesday, May 17, 2016 2:53 AM, Ian Abbott wrote: > Rename the macros defining register offsets to avoid CamelCase, and to > use namespace associated with the driver. > > Signed-off-by: Ian Abbott > --- > Other CamelCase issues in this patch will be dealt with by later > patches in the series. > --- > drivers/staging/comedi/drivers/daqboard2000.c | 112 ++++++++++++++------------ > 1 file changed, 61 insertions(+), 51 deletions(-) > > diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c > index b3b68e8..92ff8f4 100644 > --- a/drivers/staging/comedi/drivers/daqboard2000.c > +++ b/drivers/staging/comedi/drivers/daqboard2000.c > @@ -151,35 +151,35 @@ static const struct comedi_lrange range_daqboard2000_ai = { > /* > * Register Memory Map > */ > -#define acqControl 0x00 /* u16 */ > -#define acqScanListFIFO 0x02 /* u16 */ > -#define acqPacerClockDivLow 0x04 /* u32 */ > -#define acqScanCounter 0x08 /* u16 */ > -#define acqPacerClockDivHigh 0x0a /* u16 */ > -#define acqTriggerCount 0x0c /* u16 */ > -#define acqResultsFIFO 0x10 /* u16 */ > -#define acqResultsShadow 0x14 /* u16 */ > -#define acqAdcResult 0x18 /* u16 */ > -#define dacScanCounter 0x1c /* u16 */ > -#define dacControl 0x20 /* u16 */ > -#define dacFIFO 0x24 /* s16 */ > -#define dacPacerClockDiv 0x2a /* u16 */ > -#define refDacs 0x2c /* u16 */ > -#define dioControl 0x30 /* u16 */ > -#define dioP3hsioData 0x32 /* s16 */ > -#define dioP3Control 0x34 /* u16 */ > -#define calEepromControl 0x36 /* u16 */ > -#define dacSetting(x) (0x38 + (x) * 2) /* s16 */ > -#define dioP2ExpansionIO8Bit 0x40 /* s16 */ > -#define ctrTmrControl 0x80 /* u16 */ > -#define ctrInput(x) (0x88 + (x) * 2) /* s16 */ > -#define timerDivisor(x) (0xa0 + (x) * 2) /* u16 */ > -#define dmaControl 0xb0 /* u16 */ > -#define trigControl 0xb2 /* u16 */ > -#define calEeprom 0xb8 /* u16 */ > -#define acqDigitalMark 0xba /* u16 */ > -#define trigDacs 0xbc /* u16 */ > -#define dioP2ExpansionIO16Bit(x) (0xc0 + (x) * 2) /* s16 */ > +#define DAQBOARD2000_REG_ACQ_CONTROL 0x00 /* u16 */ > +#define DAQBOARD2000_REG_ACQ_SCAN_LIST_FIFO 0x02 /* u16 */ > +#define DAQBOARD2000_REG_ACQ_PACER_CLOCK_DIV_LOW 0x04 /* u32 */ > +#define DAQBOARD2000_REG_ACQ_SCAN_COUNTER 0x08 /* u16 */ > +#define DAQBOARD2000_REG_ACQ_PACER_CLOCK_DIV_HIGH 0x0a /* u16 */ > +#define DAQBOARD2000_REG_ACQ_TRIGGER_COUNT 0x0c /* u16 */ > +#define DAQBOARD2000_REG_ACQ_RESULTS_FIFO 0x10 /* u16 */ > +#define DAQBOARD2000_REG_ACQ_RESULTS_SHADOW 0x14 /* u16 */ > +#define DAQBOARD2000_REG_ACQ_ADC_RESULT 0x18 /* u16 */ > +#define DAQBOARD2000_REG_DAC_SCAN_COUNTER 0x1c /* u16 */ > +#define DAQBOARD2000_REG_DAC_CONTROL 0x20 /* u16 */ > +#define DAQBOARD2000_REG_DAC_FIFO 0x24 /* s16 */ > +#define DAQBOARD2000_REG_DAC_PACER_CLOCK_DIV 0x2a /* u16 */ > +#define DAQBOARD2000_REG_REF_DACS 0x2c /* u16 */ > +#define DAQBOARD2000_REG_DIO_CONTROL 0x30 /* u16 */ > +#define DAQBOARD2000_REG_P3_HSIO_DATA 0x32 /* s16 */ > +#define DAQBOARD2000_REG_P3_CONTROL 0x34 /* u16 */ > +#define DAQBOARD2000_REG_CAL_EEPROM_CONTROL 0x36 /* u16 */ > +#define DAQBOARD2000_REG_DAC_SETTING(x) (0x38 + (x) * 2) /* s16 */ > +#define DAQBOARD2000_REG_DIO_P2_EXP_IO_8_BIT 0x40 /* s16 */ > +#define DAQBOARD2000_REG_COUNTER_TIMER_CONTROL 0x80 /* u16 */ > +#define DAQBOARD2000_REG_COUNTER_INPUT(x) (0x88 + (x) * 2) /* s16 */ > +#define DAQBOARD2000_REG_TIMER_DIV(x) (0xa0 + (x) * 2) /* u16 */ > +#define DAQBOARD2000_REG_DMA_CONTROL 0xb0 /* u16 */ > +#define DAQBOARD2000_REG_TRIG_CONTROL 0xb2 /* u16 */ > +#define DAQBOARD2000_REG_CAL_EEPROM 0xb8 /* u16 */ > +#define DAQBOARD2000_REG_ACQ_DIGITAL_MARK 0xba /* u16 */ > +#define DAQBOARD2000_REG_TRIG_DACS 0xbc /* u16 */ > +#define DAQBOARD2000_REG_DIO_P2_EXP_IO_16_BIT(x) (0xc0 + (x) * 2) /* s16 */ Any chance we can shorten the namespace prefix? It's not a big deal but the DAQBOARD2000_ is pretty long. How about DB2K_ or even D2K_? Regards, Hartley