From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752351Ab3LBAtw (ORCPT ); Sun, 1 Dec 2013 19:49:52 -0500 Received: from bedivere.hansenpartnership.com ([66.63.167.143]:45440 "EHLO bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751949Ab3LBAtu (ORCPT ); Sun, 1 Dec 2013 19:49:50 -0500 Message-ID: <1385945387.20150.2.camel@dabdike.int.hansenpartnership.com> Subject: Re: [PATCH] drivers: scsi: scsi_lib.c: add prefix "SCSILIB_" to macro "SP" From: James Bottomley To: Chen Gang Cc: Bart Van Assche , Bottomley@parallels.com, linux-scsi@vger.kernel.org, rkuo , "linux-kernel@vger.kernel.org" Date: Sun, 01 Dec 2013 16:49:47 -0800 In-Reply-To: <529BD584.7060504@gmail.com> References: <528AEFB7.4060301@gmail.com> <20131125011938.GB18921@codeaurora.org> <5292B845.3010404@gmail.com> <5292B8A0.7020409@gmail.com> <5294255E.7040105@gmail.com> <52955913.3060809@gmail.com> <529B60FF.7030601@acm.org> <529BD584.7060504@gmail.com> Content-Type: text/plain; charset="ISO-8859-15" X-Mailer: Evolution 3.8.5 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2013-12-02 at 08:34 +0800, Chen Gang wrote: > On 12/02/2013 12:17 AM, Bart Van Assche wrote: > > On 11/27/13 03:29, Chen Gang wrote: > >> the macro "SP" is too common to make conflict with some architectures, > >> so recommend to add prefix for it. > >> > >> The related warning (with allmodconfig for hexagon): > >> > >> CC [M] drivers/scsi/scsi_lib.o > >> drivers/scsi/scsi_lib.c:46:0: warning: "SP" redefined [enabled by default] > >> arch/hexagon/include/uapi/asm/registers.h:9:0: note: this is the location of the previous definition > >> > >> > >> Signed-off-by: Chen Gang > >> --- > >> drivers/scsi/scsi_lib.c | 16 ++++++++-------- > >> 1 files changed, 8 insertions(+), 8 deletions(-) > >> > >> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c > >> index 7bd7f0d..f78e21b 100644 > >> --- a/drivers/scsi/scsi_lib.c > >> +++ b/drivers/scsi/scsi_lib.c > >> @@ -43,28 +43,28 @@ struct scsi_host_sg_pool { > >> mempool_t *pool; > >> }; > >> > >> -#define SP(x) { x, "sgpool-" __stringify(x) } > >> +#define SCSILIB_SP(x) { x, "sgpool-" __stringify(x) } > >> #if (SCSI_MAX_SG_SEGMENTS < 32) > >> #error SCSI_MAX_SG_SEGMENTS is too small (must be 32 or greater) > >> #endif > >> static struct scsi_host_sg_pool scsi_sg_pools[] = { > >> - SP(8), > >> - SP(16), > >> + SCSILIB_SP(8), > >> + SCSILIB_SP(16), > >> #if (SCSI_MAX_SG_SEGMENTS > 32) > >> - SP(32), > >> + SCSILIB_SP(32), > >> #if (SCSI_MAX_SG_SEGMENTS > 64) > >> - SP(64), > >> + SCSILIB_SP(64), > >> #if (SCSI_MAX_SG_SEGMENTS > 128) > >> - SP(128), > >> + SCSILIB_SP(128), > >> #if (SCSI_MAX_SG_SEGMENTS > 256) > >> #error SCSI_MAX_SG_SEGMENTS is too large (256 MAX) > >> #endif > >> #endif > >> #endif > >> #endif > >> - SP(SCSI_MAX_SG_SEGMENTS) > >> + SCSILIB_SP(SCSI_MAX_SG_SEGMENTS) > >> }; > >> -#undef SP > >> +#undef SCSILIB_SP > >> > >> struct kmem_cache *scsi_sdb_cache; > > > > Sorry but the "SCSILIB_SP" name doesn't look very descriptive to me. > > There are probably better choices possible. How about using e.g. > > SG_POOL() instead ? > > > > That sounds good to me, I will send patch v2, tomorrow (today I have > to do some another urgent things, if this patch is also urgent, please > help send). :-) No, this is the wrong thing to do. Exported headers should be namespace protected, so the thing wrong is what's exporting the problem to us, namely hexagon. James