From: Pavel Roskin Date: Wed, 30 Jul 2008 21:16:49 -0400 Subject: [ath9k-devel] [PATCH 11/16] ath9k: Remove "OS_" prefixes in macros. In-Reply-To: References: <4800d552efce6350888c68b859f66767196d720b.1217309551.git.lrodriguez@atheros.com> Message-ID: <1217467009.3616.9.camel@dv> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ath9k-devel@lists.ath9k.org On Mon, 2008-07-28 at 22:47 -0700, lrodriguez at atheros.com wrote: > From: Sujith Manoharan > > diff --git a/drivers/net/wireless/ath9k/ath9k.h b/drivers/net/wireless/ath9k/ath9k.h > index 6fa1eb6..c3294c0 100644 > --- a/drivers/net/wireless/ath9k/ath9k.h > +++ b/drivers/net/wireless/ath9k/ath9k.h > @@ -622,17 +622,15 @@ struct hal_country_entry { > > #define SM(_v, _f) (((_v) << _f##_S) & _f) > #define MS(_v, _f) (((_v) & _f) >> _f##_S) > -#define OS_REG_RMW(_a, _r, _set, _clr) \ > +#define REG_RMW(_a, _r, _set, _clr) \ > REG_WRITE(_a, _r, (REG_READ(_a, _r) & ~(_clr)) | (_set)) I think these are pretty good candidates for inline functions. I'm not sure removing "OS_" is a useful intermediate step. It's better to keep such massive changes to the minimum to avoid potential conflicts with other patches. -- Regards, Pavel Roskin