From patchwork Mon Oct 30 12:07:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 159711 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp2158960vqb; Mon, 30 Oct 2023 05:08:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHbFo9IvUrixFYJDOCBfnpuKgXTJIkIT1V/EhBcpawkdI/53MU1LZ4RvoGetWfCzWWblzbb X-Received: by 2002:a17:903:1c8:b0:1cc:76e:9088 with SMTP id e8-20020a17090301c800b001cc076e9088mr12537654plh.14.1698667708763; Mon, 30 Oct 2023 05:08:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698667708; cv=none; d=google.com; s=arc-20160816; b=VJgz/8ERIFoRFaZD6smLWK7AED4t+Ozi32u92uq2+QPE7vAqr5imgDfodyVAKLYYiJ t+Zo7aCJ3y+KTQF3Bxms8AoSazVzJeKcRdnxlnGrGwokophDBIQ4t5gY5mySKXglINy0 +tGIlAuvBeM8jk8vffsbykSLRPVAJKV8uxDEDInYaguYmFJU0KlSZrPT47tfWuVnajwh 5qOjcMfkdpKKshVYpcCUmsIF/9B7vcg+V2PM2mFaBls0ro049EmeB6z8opUqzfJc6qJt 1NGGZHI1UB8NtCZ1shCfVXbt6LEJZHFL9FrxMUaIQdAESeGu2O9VejYwGgd1LhDv6drP k6Ng== 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=/m85genO4bfX6y3W9JBrr+quRoHTpTUDJpF6xOVc9H4=; fh=c3++oU7I8TqZscETCslxBC3RPbuVvOiGbgAteWHBfzU=; b=c+BR+g8xUEZqzudSYAVzh2x+S0TR/4NRohVkC9erByTrbfbABH1dSE6E7bSeBeerlM kYEjWMa0ZhhtErDq3DqgAOhZDcbD69ZpGDdsJ5OmxQX5As2kpdeqkgpXYSMWTCQAwi01 QEA0sFZ1oUcogvbjzW78/CHGFK6h9eRpUnYNKRkhqmQRXXCESaD9KVxlZ7LC7akrDOLx x4T5A2joxxJPlUni7ECJtRFqS+6zyTsN54bLrxioCM9yfWCjqqYG4Tohh6d4iJLsLkV8 +1Q6kq/5m/DmC72jcEKehIsbp+gzUNEV23laLDZnqRBPyYT82zA3yM9E57Co8+SoT1kV Infg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KhsQJ0tI; 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 ju2-20020a170903428200b001c5f80bf574si838745plb.487.2023.10.30.05.08.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 05:08:28 -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=KhsQJ0tI; 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 176B6804C213; Mon, 30 Oct 2023 05:08:21 -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 S233266AbjJ3MHy (ORCPT + 31 others); Mon, 30 Oct 2023 08:07:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233187AbjJ3MHq (ORCPT ); Mon, 30 Oct 2023 08:07:46 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC11FC6; Mon, 30 Oct 2023 05:07:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698667663; x=1730203663; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kaMTYelFwgGuSlV0Gv80EqaUluoFfXrYzjdVi1fzCJw=; b=KhsQJ0tICN8wQ0xd69h3SgzUpMLcg2KaKou/eLJwkO52U96aRDgPl6rK vhphdD0FDt9tlADKfyKl+9GWv4dusmw7cpX0WHpk0gzXzVueZy+nBFINL KEOBqnnZY277vK2XPJkDMm1vf2nX/wCkZPXv9zt7tbPNfZOHMBy02+0xy ocn/b1Em9d4lYGCkQVSCL32homEAXn104CtSfA+U5Xziv1nFC8J/su4Lm 7WMcogqUzrrRBle9P/jUYyiW7/U3xLDRAJJCYAgv7OCYH+2RuQRKiD6IR bzWPPXyv0sLXlzC/JbVxOSokMHwHNbWvniFy8s1da8W0n/Y9yIItWTW4x g==; X-IronPort-AV: E=McAfee;i="6600,9927,10878"; a="373107369" X-IronPort-AV: E=Sophos;i="6.03,263,1694761200"; d="scan'208";a="373107369" 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:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10878"; a="753771405" X-IronPort-AV: E=Sophos;i="6.03,263,1694761200"; d="scan'208";a="753771405" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 30 Oct 2023 05:07:40 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 30AC336D; 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 07/17] pinctrl: elkhartlake: Switch to use Intel pin control PM ops Date: Mon, 30 Oct 2023 14:07:24 +0200 Message-Id: <20231030120734.2831419-8-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:21 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781182191417170095 X-GMAIL-MSGID: 1781182191417170095 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-elkhartlake.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-elkhartlake.c b/drivers/pinctrl/intel/pinctrl-elkhartlake.c index 81581ab85316..1678634ebc06 100644 --- a/drivers/pinctrl/intel/pinctrl-elkhartlake.c +++ b/drivers/pinctrl/intel/pinctrl-elkhartlake.c @@ -9,6 +9,7 @@ #include #include #include +#include #include @@ -485,14 +486,12 @@ static const struct acpi_device_id ehl_pinctrl_acpi_match[] = { }; MODULE_DEVICE_TABLE(acpi, ehl_pinctrl_acpi_match); -static INTEL_PINCTRL_PM_OPS(ehl_pinctrl_pm_ops); - static struct platform_driver ehl_pinctrl_driver = { .probe = intel_pinctrl_probe_by_uid, .driver = { .name = "elkhartlake-pinctrl", .acpi_match_table = ehl_pinctrl_acpi_match, - .pm = &ehl_pinctrl_pm_ops, + .pm = pm_sleep_ptr(&intel_pinctrl_pm_ops), }, }; module_platform_driver(ehl_pinctrl_driver);