From patchwork Mon Oct 30 12:07:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 739436 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0ACB6C4167D for ; Mon, 30 Oct 2023 12:07:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233156AbjJ3MHo (ORCPT ); Mon, 30 Oct 2023 08:07:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233095AbjJ3MHn (ORCPT ); Mon, 30 Oct 2023 08:07:43 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09180D9; Mon, 30 Oct 2023 05:07:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698667661; x=1730203661; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U+g4ToP0pep4SX+58VPf0Rx444C8v8gPvauRNNI21ak=; b=FfION09rQ9/2tS5Au0g3iBDNVo6CAqyhaDjVKJMbnCinufzyFiwCc4n/ Vafi1479poX1BWBc34T9GH6ewgpCwNS1LjX+BHX6U5pn9sOKkJG6pxZIR AD7m6cQaL1Q93f7Dx+zbeBCNAM3dmKYDaymQ+JWp34F1JPjKVCNSJjT3y QH67DIsONfaQgmO9ajlUDof1NXGGm9iyAhr8VOQGNscGlKbQQnTjV/zy5 BAi4zOoEplexxTv3kt1DNMRj2Vsv7aDlzCh196+9dd4gvtIZgtKVZPr24 iaxyUCyD+Diw8+YnwgfPPZ2X6ey6WEy7PCrRGHKo2CDTpq+bHZdgH7xbt w==; X-IronPort-AV: E=McAfee;i="6600,9927,10878"; a="373107324" X-IronPort-AV: E=Sophos;i="6.03,263,1694761200"; d="scan'208";a="373107324" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2023 05:07:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10878"; a="753771398" X-IronPort-AV: E=Sophos;i="6.03,263,1694761200"; d="scan'208";a="753771398" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 30 Oct 2023 05:07:37 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 10F26350; Mon, 30 Oct 2023 14:07:36 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Mika Westerberg , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andy Shevchenko , Linus Walleij , Paul Cercueil , Jonathan Cameron Subject: [PATCH v3 04/17] pinctrl: cannonlake: Switch to use Intel pin control PM ops Date: Mon, 30 Oct 2023 14:07:21 +0200 Message-Id: <20231030120734.2831419-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231030120734.2831419-1-andriy.shevchenko@linux.intel.com> References: <20231030120734.2831419-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The main driver conditionally exports the PM ops structure. Switch this driver to use it instead of customly wrapped one. Signed-off-by: Andy Shevchenko --- drivers/pinctrl/intel/pinctrl-cannonlake.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-cannonlake.c b/drivers/pinctrl/intel/pinctrl-cannonlake.c index 95976abfb785..1aa09f950be1 100644 --- a/drivers/pinctrl/intel/pinctrl-cannonlake.c +++ b/drivers/pinctrl/intel/pinctrl-cannonlake.c @@ -10,6 +10,7 @@ #include #include #include +#include #include @@ -824,14 +825,12 @@ static const struct acpi_device_id cnl_pinctrl_acpi_match[] = { }; MODULE_DEVICE_TABLE(acpi, cnl_pinctrl_acpi_match); -static INTEL_PINCTRL_PM_OPS(cnl_pinctrl_pm_ops); - static struct platform_driver cnl_pinctrl_driver = { .probe = intel_pinctrl_probe_by_hid, .driver = { .name = "cannonlake-pinctrl", .acpi_match_table = cnl_pinctrl_acpi_match, - .pm = &cnl_pinctrl_pm_ops, + .pm = pm_sleep_ptr(&intel_pinctrl_pm_ops), }, }; module_platform_driver(cnl_pinctrl_driver);