From patchwork Mon Oct 30 12:07:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 159706 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp2158799vqb; Mon, 30 Oct 2023 05:08:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpcncEiiQ68NTTnUD2YeXshs4M4Z6C6TiDmdFyWLNK4VCy/IRlw+z9hSg58n7D6waNwzOm X-Received: by 2002:a17:90a:1d1:b0:27d:8a04:f964 with SMTP id 17-20020a17090a01d100b0027d8a04f964mr10802310pjd.24.1698667696197; Mon, 30 Oct 2023 05:08:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698667696; cv=none; d=google.com; s=arc-20160816; b=j+viwQj9egt28W2BivEhsBaW85gtOi+kQde6MN7nwLIqEycnx48vP72myZn56PoUeR oim0mCwI5n6N9k6Yt+MEiFqKxjG7vwakDBi7nj48+3ZRrB8qB95pifIySTyGoHtJR77K WjYJPI+wnzRaxNs0GOVPmyB0PHvGl5JkhA2qf5kBXbXW34vqgaapDbyrgzHFsoWh6YBl JD0pR3guIrOsMJY5iwIg1YIhmeSLlbtztZ5Ld2+yEXrWgBTm3cHI8Qoeh6uowJBH72De Q1vsXFSODC0FdvbxxGpaTbGTrftjYO9ZY5WLUpmw+V9jeWP8L9W+WFb/KjCp0HCbIzux f7WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7qPxx8Pwmiz/I72UChKHhlRHtYqyRDLLKm3lBT5lQzc=; fh=c3++oU7I8TqZscETCslxBC3RPbuVvOiGbgAteWHBfzU=; b=aZ+eQiPIvxOOmSkrM5jaQ1f9OTZtXnVc8/6/+AjzaLCNsHkyQDpKuilg9P5Lzl64g/ jN0R4hXLkPD4Uj/mlUqzxyvpjv/+JSAXlXL8WYVFf2LmRNrYwokCrm2C8KU+6GJyhcFN Su+P90djEOT99Zds6lz2Ck+dM0CTwX/fxziOwoMoB9+jE3eb0PrYfMpmEQvcpMP8BIlq j7tg/C1kac4Y5i5w5d1/oF3W+UuQtet+fgsP9kMNRluBOyT2/4xq32SixTaH5FNgUlaV 2PcwP2Ep3U0jvCtGFqc46bwP+eI7MsPdT0M5fnYIDcZnqKwRgeDg6Za6UCY2W6jyVqNy 1Vkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bzhmOLB9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id nk20-20020a17090b195400b0028047ab56desi2193058pjb.36.2023.10.30.05.08.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 05:08:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bzhmOLB9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id D43D4804C236; Mon, 30 Oct 2023 05:08:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233237AbjJ3MHt (ORCPT + 31 others); Mon, 30 Oct 2023 08:07:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233144AbjJ3MHo (ORCPT ); Mon, 30 Oct 2023 08:07:44 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2756EC6; Mon, 30 Oct 2023 05:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698667662; x=1730203662; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cbL/iEqsNQDONV8MfXjxRIG+HFA+vk2CmMB4h+Mspus=; b=bzhmOLB95E+2iGN+Ol1Acv8H02R6H5YbQ+dCWa80bZFK8cuU8vpMkwT2 ZbL7NIy303pJzEAr4FGhFyv500db34/rHg09lIy0lD4e35wmuqXZifpdV NrVdDhAcmPUIP7dd0zwO6buoJJN2dBloQhgG21rcCCBzz8J7XIHcuJqlO A3MttddKzPfVCe3jRbSshSt9C/sbHyVvHuoiEm5CqGv3U1lpmwKWqZwVb VpUo97KGOkJO93nNfYjs4fahlv0/9OnniItijnDC250TUMIm6Fr6blYg/ 7BILYRcKA/B7ALIBWE/cRaMJMTvymTV2Hf/h8jQjyILi84SUMKKXeYtEB A==; X-IronPort-AV: E=McAfee;i="6600,9927,10878"; a="373107341" X-IronPort-AV: E=Sophos;i="6.03,263,1694761200"; d="scan'208";a="373107341" 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="753771401" X-IronPort-AV: E=Sophos;i="6.03,263,1694761200"; d="scan'208";a="753771401" 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 E76D4330; Mon, 30 Oct 2023 14:07:35 +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 02/17] pinctrl: alderlake: Switch to use Intel pin control PM ops Date: Mon, 30 Oct 2023 14:07:19 +0200 Message-Id: <20231030120734.2831419-3-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 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 30 Oct 2023 05:08:06 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781182178306152477 X-GMAIL-MSGID: 1781182178306152477 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-alderlake.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-alderlake.c b/drivers/pinctrl/intel/pinctrl-alderlake.c index 4a37dc273d63..7d9948e5f422 100644 --- a/drivers/pinctrl/intel/pinctrl-alderlake.c +++ b/drivers/pinctrl/intel/pinctrl-alderlake.c @@ -9,6 +9,7 @@ #include #include #include +#include #include @@ -733,14 +734,12 @@ static const struct acpi_device_id adl_pinctrl_acpi_match[] = { }; MODULE_DEVICE_TABLE(acpi, adl_pinctrl_acpi_match); -static INTEL_PINCTRL_PM_OPS(adl_pinctrl_pm_ops); - static struct platform_driver adl_pinctrl_driver = { .probe = intel_pinctrl_probe_by_hid, .driver = { .name = "alderlake-pinctrl", .acpi_match_table = adl_pinctrl_acpi_match, - .pm = &adl_pinctrl_pm_ops, + .pm = pm_sleep_ptr(&intel_pinctrl_pm_ops), }, }; module_platform_driver(adl_pinctrl_driver);