From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1755445AbcJ2PwZ (ORCPT <rfc822;w@1wt.eu>);
        Sat, 29 Oct 2016 11:52:25 -0400
Received: from mga01.intel.com ([192.55.52.88]:37334 "EHLO mga01.intel.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751352AbcJ2PwY (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Sat, 29 Oct 2016 11:52:24 -0400
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.31,564,1473145200"; 
   d="scan'208";a="25138389"
Message-ID: <1477756163.8025.0.camel@linux.intel.com>
Subject: Re: [PATCH] HID: intel-ish-hid: Fix !CONFIG_PM build warning
From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
To: Borislav Petkov <bp@alien8.de>, LKML <linux-kernel@vger.kernel.org>
Cc: Jiri Kosina <jikos@kernel.org>,
        Benjamin Tissoires <benjamin.tissoires@redhat.com>,
        Wei Yongjun <weiyongjun1@huawei.com>, linux-input@vger.kernel.org
Date: Sat, 29 Oct 2016 08:49:23 -0700
In-Reply-To: <20161029111740.741-1-bp@alien8.de>
References: <20161029111740.741-1-bp@alien8.de>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.18.5.2 (3.18.5.2-1.fc23) 
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sat, 2016-10-29 at 13:17 +0200, Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
> 
> Fix
> 
>   drivers/hid/intel-ish-hid/ipc/pci-ish.c:247:12: warning:
> ‘ish_suspend’ defined but not used [-Wunused-function]
>    static int ish_suspend(struct device *device)
>               ^
>   drivers/hid/intel-ish-hid/ipc/pci-ish.c:282:12: warning:
> ‘ish_resume’ defined but not used [-Wunused-function]
>    static int ish_resume(struct device *device)
>             ^
> by sticking them in the CONFIG_PM range too.
> 
> Signed-off-by: Borislav Petkov <bp@suse.de>
> Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> Cc: Jiri Kosina <jikos@kernel.org>
> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> Cc: Wei Yongjun <weiyongjun1@huawei.com>
> Cc: linux-input@vger.kernel.org

Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>-

> ---
>  drivers/hid/intel-ish-hid/ipc/pci-ish.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> index 42f0beeb09fd..7e3622a724aa 100644
> --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> @@ -202,6 +202,7 @@ static void ish_remove(struct pci_dev *pdev)
>  	kfree(ishtp_dev);
>  }
>  
> +#ifdef CONFIG_PM
>  static struct device *ish_resume_device;
>  
>  /**
> @@ -293,7 +294,6 @@ static int ish_resume(struct device *device)
>  	return 0;
>  }
>  
> -#ifdef CONFIG_PM
>  static const struct dev_pm_ops ish_pm_ops = {
>  	.suspend = ish_suspend,
>  	.resume = ish_resume,
> @@ -301,7 +301,7 @@ static const struct dev_pm_ops ish_pm_ops = {
>  #define ISHTP_ISH_PM_OPS	(&ish_pm_ops)
>  #else
>  #define ISHTP_ISH_PM_OPS	NULL
> -#endif
> +#endif /* CONFIG_PM */
>  
>  static struct pci_driver ish_driver = {
>  	.name = KBUILD_MODNAME,