public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Li, Aubrey" <aubrey.li@linux.intel.com>
To: Martin Kelly <martin@martingkelly.com>, x86@kernel.org, mingo@redhat.com
Cc: vishwesh.m.rudramuni@intel.com, joe@perches.com,
	hpa@linux.intel.com, linux-kernel@vger.kernel.org,
	Martin Kelly <martkell@amazon.com>
Subject: Re: [PATCH v3] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n
Date: Fri, 19 Sep 2014 07:52:49 +0800	[thread overview]
Message-ID: <541B7051.2040803@linux.intel.com> (raw)
In-Reply-To: <1410963476-8360-1-git-send-email-martin@martingkelly.com>

On 2014/9/17 22:17, Martin Kelly wrote:
> When compiling with CONFIG_DEBUG_FS=n, gcc emits an unused variable
> warning for pmc_atom.c because "ret" is used only within the
> CONFIG_DEBUG_FS block. This patch adds a dummy #ifdef for
> pmc_dbgfs_register when CONFIG_DEBUG_FS=n to simplify the code and
> remove the warning.
> 
> Signed-off-by: Martin Kelly <martkell@amazon.com>

Looks good to me, thanks Martin!

> ---
> Changes in v3:
>   - Further unified the return code logic, as suggested by Ingo Molnar
> 
> Changes in v2:
>   - Implemented Ingo Molnar's suggestion to #ifdef the function rather
>     than the lines.
> ---
>  arch/x86/kernel/pmc_atom.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/kernel/pmc_atom.c b/arch/x86/kernel/pmc_atom.c
> index 0c424a6..0ee5025e 100644
> --- a/arch/x86/kernel/pmc_atom.c
> +++ b/arch/x86/kernel/pmc_atom.c
> @@ -235,6 +235,11 @@ err:
>  	pmc_dbgfs_unregister(pmc);
>  	return -ENODEV;
>  }
> +#else
> +static int pmc_dbgfs_register(struct pmc_dev *pmc, struct pci_dev *pdev)
> +{
> +	return 0;
> +}
>  #endif /* CONFIG_DEBUG_FS */
>  
>  static int pmc_setup_dev(struct pci_dev *pdev)
> @@ -262,14 +267,12 @@ static int pmc_setup_dev(struct pci_dev *pdev)
>  	/* PMC hardware registers setup */
>  	pmc_hw_reg_setup(pmc);
>  
> -#ifdef CONFIG_DEBUG_FS
>  	ret = pmc_dbgfs_register(pmc, pdev);
>  	if (ret) {
>  		iounmap(pmc->regmap);
> -		return ret;
>  	}
> -#endif /* CONFIG_DEBUG_FS */
> -	return 0;
> +
> +	return ret;
>  }
>  
>  /*
> 


  reply	other threads:[~2014-09-18 23:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-17 14:17 [PATCH v3] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n Martin Kelly
2014-09-18 23:52 ` Li, Aubrey [this message]
2014-09-19 11:48 ` [tip:x86/platform] x86/platform/pmc_atom: " tip-bot for Martin Kelly

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=541B7051.2040803@linux.intel.com \
    --to=aubrey.li@linux.intel.com \
    --cc=hpa@linux.intel.com \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=martin@martingkelly.com \
    --cc=martkell@amazon.com \
    --cc=mingo@redhat.com \
    --cc=vishwesh.m.rudramuni@intel.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox