From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751784AbcEQRWL (ORCPT ); Tue, 17 May 2016 13:22:11 -0400 Received: from mail-bl2on0133.outbound.protection.outlook.com ([65.55.169.133]:23227 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751635AbcEQRWJ convert rfc822-to-8bit (ORCPT ); Tue, 17 May 2016 13:22:09 -0400 From: Hartley Sweeten To: Ian Abbott , "devel@driverdev.osuosl.org" CC: Greg Kroah-Hartman , "linux-kernel@vger.kernel.org" Subject: RE: [PATCH 05/14] staging: comedi: daqboard2000: rename serial EEPROM register macros Thread-Topic: [PATCH 05/14] staging: comedi: daqboard2000: rename serial EEPROM register macros Thread-Index: AQHRsCHyeop3oBFwmEmlEbDAKJixkp+9X1Pw Date: Tue, 17 May 2016 17:22:06 +0000 Message-ID: References: <1463478773-5916-1-git-send-email-abbotti@mev.co.uk> <1463478773-5916-6-git-send-email-abbotti@mev.co.uk> In-Reply-To: <1463478773-5916-6-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: 70c7f7a5-3f7e-4019-15e1-08d37e77c564 x-microsoft-exchange-diagnostics: 1;CO2PR01MB2086;5:N2h0aN5oWamahD+Jnvbe9qWEOgGVq58GjxwvRTv+UGuqZf7EjLCuqLYX+ydvuG5qipJvYN3hpsLAYMHVC2vryY3IaxGiKiwawYHjnsHHv1OoczP+rXD8GawEK3mU1ADttEaG7/GWqJa3RMKFH2mZIw==;24:EjMIoXGt9JMXQD869Ebm21PfxW240Z/lj1p216nWIvtbYg7KHUPT3NnwxbrOdDgOCe7GaYf9p8IBJDMUftOYiYy03pv+Sy2gDr1T8Vm+0lQ=;7:4sbSBwRdIe4OWMo2YSn6CqDowEiwJ5IygAwXkMscMwTkhJtMoFst/H3xIk3WWFU95YIgEnMKIOYFYN4g8TN6pSb+W5qs/Q+dV0iLDEdLtAH0oRRVe+kMVjt+D4kfS+NuwW6Yr++Bf/z1njqzDWCzA4gERQeoR+I8mcoEWGD/F34jdaMdb+rkIwQeZGq1a1Ss x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR01MB2086; 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:CO2PR01MB2086;BCL:0;PCL:0;RULEID:;SRVR:CO2PR01MB2086; x-forefront-prvs: 0945B0CC72 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(377454003)(24454002)(86362001)(575784001)(2900100001)(2950100001)(92566002)(5003600100002)(122556002)(50986999)(54356999)(76176999)(106116001)(33656002)(19580405001)(19580395003)(5001770100001)(189998001)(77096005)(8676002)(81166006)(2501003)(5002640100001)(10400500002)(8936002)(80792005)(586003)(66066001)(5008740100001)(4326007)(2906002)(5004730100002)(102836003)(1220700001)(3846002)(6116002)(87936001)(9686002)(74316001)(11100500001)(19627235001);DIR:OUT;SFP:1102;SCL:1;SRVR:CO2PR01MB2086;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:22:06.4438 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d698601f-af92-4269-8099-fd6f11636477 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR01MB2086 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 values for the Serial EEPROM Control Register > to avoid CamelCase. > > Signed-off-by: Ian Abbott > --- > drivers/staging/comedi/drivers/daqboard2000.c | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c > index fde0924..b3b68e8 100644 > --- a/drivers/staging/comedi/drivers/daqboard2000.c > +++ b/drivers/staging/comedi/drivers/daqboard2000.c > @@ -116,12 +116,12 @@ > #define DAQBOARD2000_SUBSYSTEM_IDS4 0x0004 /* Daqboard/2000 - 4 Dacs */ Ian, This board uses a PLX-9080 chip for the PCI interface. If would be better to include and use the register/bit defines to remove the magic numbers. The only PLX register used is PLX_CONTROL_REG (0x6c). > /* Initialization bits for the Serial EEPROM Control Register */ > -#define DAQBOARD2000_SECRProgPinHi 0x8001767e > -#define DAQBOARD2000_SECRProgPinLo 0x8000767e > -#define DAQBOARD2000_SECRLocalBusHi 0xc000767e > -#define DAQBOARD2000_SECRLocalBusLo 0x8000767e > -#define DAQBOARD2000_SECRReloadHi 0xa000767e > -#define DAQBOARD2000_SECRReloadLo 0x8000767e > +#define DAQBOARD2000_SECR_PROG_PIN_HI 0x8001767e > +#define DAQBOARD2000_SECR_PROG_PIN_LO 0x8000767e > +#define DAQBOARD2000_SECR_LOCAL_BUS_HI 0xc000767e > +#define DAQBOARD2000_SECR_LOCAL_BUS_LO 0x8000767e > +#define DAQBOARD2000_SECR_RELOAD_HI 0xa000767e > +#define DAQBOARD2000_SECR_RELOAD_LO 0x8000767e These "Initialization bits" are just various combinations of the PLX_CONTROL_REG bit defines (CTL_*) to toggle the various EEPROM bits. > /* SECR status bits */ > #define DAQBOARD2000_EEPROM_PRESENT 0x10000000 > @@ -438,9 +438,9 @@ static void daqboard2000_resetLocalBus(struct comedi_device *dev) > { > struct daqboard2000_private *devpriv = dev->private; > > - writel(DAQBOARD2000_SECRLocalBusHi, devpriv->plx + 0x6c); > + writel(DAQBOARD2000_SECR_LOCAL_BUS_HI, devpriv->plx + 0x6c); > mdelay(10); > - writel(DAQBOARD2000_SECRLocalBusLo, devpriv->plx + 0x6c); > + writel(DAQBOARD2000_SECR_LOCAL_BUS_LO, devpriv->plx + 0x6c); > mdelay(10); > } > > @@ -448,11 +448,11 @@ static void daqboard2000_reloadPLX(struct comedi_device *dev) > { > struct daqboard2000_private *devpriv = dev->private; > > - writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c); > + writel(DAQBOARD2000_SECR_RELOAD_LO, devpriv->plx + 0x6c); > mdelay(10); > - writel(DAQBOARD2000_SECRReloadHi, devpriv->plx + 0x6c); > + writel(DAQBOARD2000_SECR_RELOAD_HI, devpriv->plx + 0x6c); > mdelay(10); > - writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c); > + writel(DAQBOARD2000_SECR_RELOAD_LO, devpriv->plx + 0x6c); > mdelay(10); > } > > @@ -460,9 +460,9 @@ static void daqboard2000_pulseProgPin(struct comedi_device *dev) > { > struct daqboard2000_private *devpriv = dev->private; > > - writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c); > + writel(DAQBOARD2000_SECR_PROG_PIN_HI, devpriv->plx + 0x6c); > mdelay(10); > - writel(DAQBOARD2000_SECRProgPinLo, devpriv->plx + 0x6c); > + writel(DAQBOARD2000_SECR_PROG_PIN_LO, devpriv->plx + 0x6c); > mdelay(10); /* Not in the original code, but I like symmetry... */ > } Regards, Hartley