Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752969AbbFFRuW (ORCPT ); Sat, 6 Jun 2015 13:50:22 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:35658 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752525AbbFFRuS (ORCPT ); Sat, 6 Jun 2015 13:50:18 -0400 MIME-Version: 1.0 In-Reply-To: <1433492863-893-1-git-send-email-valentinrothberg@gmail.com> References: <1433492863-893-1-git-send-email-valentinrothberg@gmail.com> From: Oded Gabbay Date: Sat, 6 Jun 2015 20:49:46 +0300 Message-ID: Subject: Re: [PATCH] drm/amdkfd: avoid CONFIG_ prefix for non-Kconfig symbols To: Valentin Rothberg Cc: Maling list - DRI developers , "Linux-Kernel@Vger. Kernel. Org" , deathsimple@vodafone.de, hengelein Stefan Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4245 Lines: 93 On Fri, Jun 5, 2015 at 11:27 AM, Valentin Rothberg wrote: > The CONFIG_ prefix is reserved for Kconfig options in Make and CPP > syntax. Various static analysis tools rely on this naming convention > and check if CONFIG_ prefixed symbols are defined Kconfig. Hence add > yet another prefix AMD_ to CONFIG_REG_{BASE,END,SISE} to apply to this > convention and make static analysis tools happy. > > Signed-off-by: Valentin Rothberg > --- > drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 10 +++++----- > drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h | 6 +++--- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c > index 96153f28d73f..c34c393e9aea 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c > @@ -445,7 +445,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, > aw_reg_add_dword /= sizeof(uint32_t); > > packets_vec[0].bitfields2.reg_offset = > - aw_reg_add_dword - CONFIG_REG_BASE; > + aw_reg_add_dword - AMD_CONFIG_REG_BASE; > > packets_vec[0].reg_data[0] = cntl.u32All; > > @@ -458,7 +458,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, > aw_reg_add_dword /= sizeof(uint32_t); > > packets_vec[1].bitfields2.reg_offset = > - aw_reg_add_dword - CONFIG_REG_BASE; > + aw_reg_add_dword - AMD_CONFIG_REG_BASE; > packets_vec[1].reg_data[0] = addrHi.u32All; > > aw_reg_add_dword = > @@ -470,7 +470,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, > aw_reg_add_dword /= sizeof(uint32_t); > > packets_vec[2].bitfields2.reg_offset = > - aw_reg_add_dword - CONFIG_REG_BASE; > + aw_reg_add_dword - AMD_CONFIG_REG_BASE; > packets_vec[2].reg_data[0] = addrLo.u32All; > > /* enable watch flag if address is not zero*/ > @@ -488,7 +488,7 @@ static int dbgdev_address_watch_diq(struct kfd_dbgdev *dbgdev, > aw_reg_add_dword /= sizeof(uint32_t); > > packets_vec[3].bitfields2.reg_offset = > - aw_reg_add_dword - CONFIG_REG_BASE; > + aw_reg_add_dword - AMD_CONFIG_REG_BASE; > packets_vec[3].reg_data[0] = cntl.u32All; > > status = dbgdev_diq_submit_ib( > @@ -690,7 +690,7 @@ static int dbgdev_wave_control_diq(struct kfd_dbgdev *dbgdev, > packets_vec[1].header.opcode = IT_SET_CONFIG_REG; > packets_vec[1].header.type = PM4_TYPE_3; > packets_vec[1].bitfields2.reg_offset = SQ_CMD / (sizeof(uint32_t)) - > - CONFIG_REG_BASE; > + AMD_CONFIG_REG_BASE; > > packets_vec[1].bitfields2.vmid_shift = SQ_CMD_VMID_OFFSET; > packets_vec[1].bitfields2.insert_vmid = 1; > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h > index 4b0dd5aa5306..03424c20920c 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h > @@ -48,9 +48,9 @@ enum { > > /* CONFIG reg space definition */ > enum { > - CONFIG_REG_BASE = 0x2000, /* in dwords */ > - CONFIG_REG_END = 0x2B00, > - CONFIG_REG_SIZE = CONFIG_REG_END - CONFIG_REG_BASE > + AMD_CONFIG_REG_BASE = 0x2000, /* in dwords */ > + AMD_CONFIG_REG_END = 0x2B00, > + AMD_CONFIG_REG_SIZE = AMD_CONFIG_REG_END - AMD_CONFIG_REG_BASE > }; > > /* SH reg space definition */ > -- > 2.4.2 > Thanks! Applied to my -next-fixes tree Oded -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/