From patchwork Fri Jun 11 11:55:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 12315573 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3728BC48BE0 for ; Fri, 11 Jun 2021 11:56:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 16BE7613FF for ; Fri, 11 Jun 2021 11:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229824AbhFKL6J (ORCPT ); Fri, 11 Jun 2021 07:58:09 -0400 Received: from mga18.intel.com ([134.134.136.126]:32139 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231264AbhFKL6J (ORCPT ); Fri, 11 Jun 2021 07:58:09 -0400 IronPort-SDR: w2MpZ/rcBwzfM9Fz9dz9d9gld/ox8LDB/pczx1trAF3zOiy/sDy/eA2ikVKgGP3bcHcT8V2Bo6 Erjz28VhDjJw== X-IronPort-AV: E=McAfee;i="6200,9189,10011"; a="192823298" X-IronPort-AV: E=Sophos;i="5.83,265,1616482800"; d="scan'208";a="192823298" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jun 2021 04:56:08 -0700 IronPort-SDR: VPOpU5DEXcJEQW3XshlW/2InqzDLI2AYsLzcgt2o6ssvnbd5iC10sjOWVr25M0taMfNbMnLiMa aSTMMWpmXkZA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,265,1616482800"; d="scan'208";a="486562681" Received: from unknown (HELO mylly.fi.intel.com.) ([10.237.72.51]) by fmsmga002.fm.intel.com with ESMTP; 11 Jun 2021 04:56:07 -0700 From: Jarkko Nikula To: linux-iio@vger.kernel.org Cc: William Breathitt Gray , Jarkko Nikula , Jonathan Cameron Subject: [PATCH 1/2] counter: intel-qep: Mark PM callbacks with __maybe_unused Date: Fri, 11 Jun 2021 14:55:57 +0300 Message-Id: <20210611115558.796338-1-jarkko.nikula@linux.intel.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Remove CONFIG_PM ifdef and mark PM callbacks with __maybe_unused. Suggested-by: Jonathan Cameron Signed-off-by: Jarkko Nikula Acked-by: William Breathitt Gray --- drivers/counter/intel-qep.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/counter/intel-qep.c b/drivers/counter/intel-qep.c index ab10ba33f46a..a8d3dccecc0f 100644 --- a/drivers/counter/intel-qep.c +++ b/drivers/counter/intel-qep.c @@ -473,8 +473,7 @@ static void intel_qep_remove(struct pci_dev *pci) intel_qep_writel(qep, INTEL_QEPCON, 0); } -#ifdef CONFIG_PM -static int intel_qep_suspend(struct device *dev) +static int __maybe_unused intel_qep_suspend(struct device *dev) { struct pci_dev *pdev = container_of(dev, struct pci_dev, dev); struct intel_qep *qep = pci_get_drvdata(pdev); @@ -486,7 +485,7 @@ static int intel_qep_suspend(struct device *dev) return 0; } -static int intel_qep_resume(struct device *dev) +static int __maybe_unused intel_qep_resume(struct device *dev) { struct pci_dev *pdev = container_of(dev, struct pci_dev, dev); struct intel_qep *qep = pci_get_drvdata(pdev); @@ -512,7 +511,6 @@ static int intel_qep_resume(struct device *dev) return 0; } -#endif static UNIVERSAL_DEV_PM_OPS(intel_qep_pm_ops, intel_qep_suspend, intel_qep_resume, NULL); From patchwork Fri Jun 11 11:55:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 12315575 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82BBDC48BE5 for ; Fri, 11 Jun 2021 11:56:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 66F7E61407 for ; Fri, 11 Jun 2021 11:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231181AbhFKL6K (ORCPT ); Fri, 11 Jun 2021 07:58:10 -0400 Received: from mga18.intel.com ([134.134.136.126]:32139 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230370AbhFKL6J (ORCPT ); Fri, 11 Jun 2021 07:58:09 -0400 IronPort-SDR: SMrmgxTGDrhCn9QLC/czd68uhs1lzPfIhtPxqdnxO2a3rTXGWBDW2sYfQ+/ANzysNYum5ts12o XIRJ73D5zhzQ== X-IronPort-AV: E=McAfee;i="6200,9189,10011"; a="192823301" X-IronPort-AV: E=Sophos;i="5.83,265,1616482800"; d="scan'208";a="192823301" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jun 2021 04:56:11 -0700 IronPort-SDR: /13fzcseaoVbxbqqBqSLflarZ+zSAvOULwGXbUf0LaVAj7NWpwhHqkmhMezGU2DB9NpWYOT9p1 lAbRTZD2wcWw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,265,1616482800"; d="scan'208";a="486562692" Received: from unknown (HELO mylly.fi.intel.com.) ([10.237.72.51]) by fmsmga002.fm.intel.com with ESMTP; 11 Jun 2021 04:56:09 -0700 From: Jarkko Nikula To: linux-iio@vger.kernel.org Cc: William Breathitt Gray , Jarkko Nikula , Jonathan Cameron Subject: [PATCH 2/2] counter: intel-qep: Use to_pci_dev() helper Date: Fri, 11 Jun 2021 14:55:58 +0300 Message-Id: <20210611115558.796338-2-jarkko.nikula@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210611115558.796338-1-jarkko.nikula@linux.intel.com> References: <20210611115558.796338-1-jarkko.nikula@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Use to_pci_dev() helper instead of container_of(d, struct pci_dev, dev); Suggested-by: Jonathan Cameron Signed-off-by: Jarkko Nikula --- drivers/counter/intel-qep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/counter/intel-qep.c b/drivers/counter/intel-qep.c index a8d3dccecc0f..8d7ae28fbd67 100644 --- a/drivers/counter/intel-qep.c +++ b/drivers/counter/intel-qep.c @@ -475,7 +475,7 @@ static void intel_qep_remove(struct pci_dev *pci) static int __maybe_unused intel_qep_suspend(struct device *dev) { - struct pci_dev *pdev = container_of(dev, struct pci_dev, dev); + struct pci_dev *pdev = to_pci_dev(dev); struct intel_qep *qep = pci_get_drvdata(pdev); qep->qepcon = intel_qep_readl(qep, INTEL_QEPCON); @@ -487,7 +487,7 @@ static int __maybe_unused intel_qep_suspend(struct device *dev) static int __maybe_unused intel_qep_resume(struct device *dev) { - struct pci_dev *pdev = container_of(dev, struct pci_dev, dev); + struct pci_dev *pdev = to_pci_dev(dev); struct intel_qep *qep = pci_get_drvdata(pdev); /*