From patchwork Fri Nov 24 19:31: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: 169561 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1497814vqx; Fri, 24 Nov 2023 12:03:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IFlaIXrcbdOLqX2Mkg37ewPRqJMakll7swIrtXxQVjxB5iuldoj/fRuISTLgppCJaVHNEmI X-Received: by 2002:a05:6870:32ca:b0:1f9:5490:8f3f with SMTP id r10-20020a05687032ca00b001f954908f3fmr4796141oac.7.1700856207228; Fri, 24 Nov 2023 12:03:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700856207; cv=none; d=google.com; s=arc-20160816; b=Sjl+Kt+EaM5KBplC//MsNDalspj+4EnRFf4dSxdIbCxSEfut4ol4qyu0io5yZbqiJq cC0yZ7OhczV5dRggHGL7wAgPw4/CkS0Ra2FhT0LSSHkXozrzgpj+554LB8rtw0vB8foS n1ruyP+q4ORFR6NAHvxvk1wJ01x64pfoWzzJ2ozNQtP6TdWv9cqVjUvGZDg7PWkz1Vki Wgrsb1H0HVArGz9JaXyPKlsjj3un9RrbkopH/w2n/Vw/7jcCs8er0TLhk27bA5Ic3bf2 9VIocqHdcnYedm6wUNkmhT9yc2JYz7rvCSHfTl/R+7QLsC31qBo/qoT/91G4v/WhOubI jESA== 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=BMGv9Rv3xheVQ/2yXRD0dYZEJwT8OFRAuLg+vBUqU+g=; fh=NrWLvEVUW8ufGou/ZOuWZl9yKC+ByU+oxgRUdXMV2yI=; b=sPJ0Jo/XLI7OiYmdYMGBWf0nlKoz0oGcVB/rY6bhKSGRTgXgpbHrNXekoRewHGRq7q xUbfqT4r0n5V24HYyavJHUy/io62AJTII/njbynJj+HW4Vl6BUH6xeAR2pdkL7HRybpm zMz4cnbKvA8iTSmJ0dOAy7l0sioecNUJGpvDXIYXdfNfsSw8BX14+N2hRGar94JaG/ZX cHVfyMtTLh5jLX/S3XuG3bQjussRSWVzX5oTKanOSrMfjdfPlX+biaUha1MsXtm6vUL5 ox9vFe+a+9t12VzVoOKuflNK/B0XnL1tekYLk8KQsb6BYo24n5vfNiBq3Ylk0bw7iVtA mjUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="dyb/UG6J"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id oz12-20020a056870cb4c00b001f94805aa6csi1760960oab.305.2023.11.24.12.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 12:03:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="dyb/UG6J"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 44349804E71F; Fri, 24 Nov 2023 12:03:25 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346104AbjKXUDH (ORCPT + 99 others); Fri, 24 Nov 2023 15:03:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231940AbjKXUDB (ORCPT ); Fri, 24 Nov 2023 15:03:01 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D5741707 for ; Fri, 24 Nov 2023 12:03:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700856186; x=1732392186; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=G09mUvl/RQNAtAzlY9grLZnLKlc0fBxbF/IUfivypek=; b=dyb/UG6Js2b10cWn8vw+J/07KoGvstf/iuXiC+vp1uXNe2HhTBEs2Bdn UmBEROvzYzn0X+ASokZuy8ZT7xV7PEqH2+T2DuvFCUrF8ChhFFZd9E21t rhE/TgkBHYGUiMCs/mWirTydfs43E35j7U0Z5HBbXiKr1+AfH8yj2stSd Ek2bIvAFxxQ0sqBJr2k/X5q1mDMJt/1nXfga4tlRexBW2AL6iM8W73uZ6 /Y9Bg2E6XNrD6WVnQlZNmKFnq+DdeV2/x2meeks+sUwoNeaY1qfAwMeXk Rap/dfImmnxD0ZP6e6GjbU7DD/0KALP0JfClbSELdipGudXI3E/t0Gwb8 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10904"; a="396366606" X-IronPort-AV: E=Sophos;i="6.04,224,1695711600"; d="scan'208";a="396366606" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2023 12:03:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10904"; a="833763308" X-IronPort-AV: E=Sophos;i="6.04,224,1695711600"; d="scan'208";a="833763308" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 24 Nov 2023 12:03:04 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 944791A7; Fri, 24 Nov 2023 22:03:03 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org Cc: Lee Jones Subject: [PATCH v1 1/5] mfd: intel-lpss: Revert "Add missing check for platform_get_resource" Date: Fri, 24 Nov 2023 21:31:24 +0200 Message-ID: <20231124200258.3682979-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231124200258.3682979-1-andriy.shevchenko@linux.intel.com> References: <20231124200258.3682979-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Fri, 24 Nov 2023 12:03:25 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783476998371594930 X-GMAIL-MSGID: 1783476998371594930 This reverts commit d918e0d5824495a75d00b879118b098fcab36fdb. The commit in question does not fix anything and only introduces a duplication in the code. The main intel_lpss_probe() performs all necessary checks. While at it and in order of avoiding similar patches to come, add a comment. Signed-off-by: Andy Shevchenko --- drivers/mfd/intel-lpss-acpi.c | 4 +--- drivers/mfd/intel-lpss-pci.c | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c index 5184fd1a5df1..52ffc0d9c23f 100644 --- a/drivers/mfd/intel-lpss-acpi.c +++ b/drivers/mfd/intel-lpss-acpi.c @@ -182,10 +182,8 @@ static int intel_lpss_acpi_probe(struct platform_device *pdev) if (!info) return -ENOMEM; + /* No need to check mem and irq here as intel_lpss_probe() does it for us */ info->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!info->mem) - return -ENODEV; - info->irq = platform_get_irq(pdev, 0); ret = intel_lpss_probe(&pdev->dev, info); diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c index cf56cd3a40ee..709b0fb4419d 100644 --- a/drivers/mfd/intel-lpss-pci.c +++ b/drivers/mfd/intel-lpss-pci.c @@ -46,6 +46,7 @@ static int intel_lpss_pci_probe(struct pci_dev *pdev, if (!info) return -ENOMEM; + /* No need to check mem and irq here as intel_lpss_probe() does it for us */ info->mem = pci_resource_n(pdev, 0); info->irq = pci_irq_vector(pdev, 0); From patchwork Fri Nov 24 19:31:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 169559 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1497631vqx; Fri, 24 Nov 2023 12:03:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IGOxtK1grV15matm43K65nD0wnstaLhqxAufU/3Lkm7m+WfeE5g/g/NJb13O9eYV1vZPahU X-Received: by 2002:a62:6506:0:b0:6be:e54e:a540 with SMTP id z6-20020a626506000000b006bee54ea540mr3683249pfb.30.1700856195771; Fri, 24 Nov 2023 12:03:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700856195; cv=none; d=google.com; s=arc-20160816; b=WNDJT7rXQE3U++OODrLdSf6tdD4iMo0FKp1++3MA2XF9Oiqxt/xVtK0h9T1jqAdkkU ELbTZkzjZ/JtTRuBIqmLpWFP0qr5miKrqbLPBe+UoPhfNKkzn5QOiEeaT7ycJiI5i2bo IlxIREWBEGky3vnDX8/eqS3N6ECZVhD31cF9TgOnQV/Ic12cerp2up8oleWAyIpT6iOA OZZIPYXCiVzvvKS+yGKkRL8GJT3k7vGOGqnd7x+oKxIGrKuFHUFzE5ZmfBEQO0egAMLW 9EAvwhx1TwkN5mwCtNTu7kFlStGKEp0QwBsR5ewf0JK5rO5R1czScOEFvooggXtf3rXi GSQA== 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=LAITqikACwyzCnOSzLv7Myp19dm3HpOqAdH2DP/RoBc=; fh=NrWLvEVUW8ufGou/ZOuWZl9yKC+ByU+oxgRUdXMV2yI=; b=BnTlgEA7i5K96SLIjFUqpcuZDIqhbM/1b1FFQs65mUAvHvHP827JbvWLNAThTqAxFH WtjIE7Vbnr74GMxlHElCQNGb0Lgf3AZP4+SPmPBO0ZtykSP4+UNLMe2d5Ka+60qrGveI GaqHskNr56/DSL6al0dy+3WoSsfvEFVH6co2i6aRKABymol1SUXhUIIuFHUKhPU/oCcw gAO4tba8+iWxwES3flplFQYsEbcTVA8oXPfwPjMlsh9Q4a+7xguwKTyi0YaDMgywEGx8 lwMvXhRzoP2ZAtR/zA5kbNjNhSwLQQfUgMWbCDn4g9HJcuAa1dhaw3FExfpyx2oelK/a OV3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=A8gd5ORy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id z13-20020a63e54d000000b0056ad01ddc36si4291634pgj.509.2023.11.24.12.03.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 12:03:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=A8gd5ORy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id C5C18808497E; Fri, 24 Nov 2023 12:03:09 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232591AbjKXUDB (ORCPT + 99 others); Fri, 24 Nov 2023 15:03:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231671AbjKXUC7 (ORCPT ); Fri, 24 Nov 2023 15:02:59 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15A3310F0 for ; Fri, 24 Nov 2023 12:03:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700856186; x=1732392186; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3tmtC5KUuDw5A1U1orOmx8i0hwlt4bNoEEqmp3Gufpw=; b=A8gd5ORybv2hYsuQyLWV1m9ptuvMFfZ2Od+qvDvGpFhuwHO9jPyksSMh nDjBqCXo+vZdK0Pekiz/R12Ykxqg4W4Th0MiEmJNQeoHA3jeRXP0t9bv4 1krOTnRkDl/7YrvUivF9+UL60kGMm7UOlzFR6K+9TkEUffDC6tnUNrO57 N5eUCf4u7K1aBvVCRyyafzQ3swl2LKpXOjAvQxZ3UR01n/X2EuKoApIyv 58v3HdLH40gXBBPgDoJ9SF+emGADVIsOYNO1KKqv3Bk6yEJRLAzaORzhK jDBxhVDqLFKfhXMYZVwhqrbt6sNVjss7RDIGawaQq138oa3ixcuu8q24H A==; X-IronPort-AV: E=McAfee;i="6600,9927,10904"; a="391338130" X-IronPort-AV: E=Sophos;i="6.04,224,1695711600"; d="scan'208";a="391338130" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2023 12:03:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10904"; a="1014983738" X-IronPort-AV: E=Sophos;i="6.04,224,1695711600"; d="scan'208";a="1014983738" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 24 Nov 2023 12:03:04 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id A271E26D; Fri, 24 Nov 2023 22:03:03 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org Cc: Lee Jones Subject: [PATCH v1 2/5] mfd: intel-lpss: Use device_get_match_data() Date: Fri, 24 Nov 2023 21:31:25 +0200 Message-ID: <20231124200258.3682979-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231124200258.3682979-1-andriy.shevchenko@linux.intel.com> References: <20231124200258.3682979-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Fri, 24 Nov 2023 12:03:10 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783476986491235714 X-GMAIL-MSGID: 1783476986491235714 Use preferred device_get_match_data() instead of acpi_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers. Introduce a temporary variable in PCI glue driver to be consistent with ACPI one on the same matter. Signed-off-by: Andy Shevchenko --- drivers/mfd/intel-lpss-acpi.c | 11 +++++------ drivers/mfd/intel-lpss-pci.c | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c index 52ffc0d9c23f..bba208235754 100644 --- a/drivers/mfd/intel-lpss-acpi.c +++ b/drivers/mfd/intel-lpss-acpi.c @@ -8,9 +8,9 @@ * Mika Westerberg */ -#include #include #include +#include #include #include #include @@ -169,16 +169,15 @@ MODULE_DEVICE_TABLE(acpi, intel_lpss_acpi_ids); static int intel_lpss_acpi_probe(struct platform_device *pdev) { + const struct intel_lpss_platform_info *data; struct intel_lpss_platform_info *info; - const struct acpi_device_id *id; int ret; - id = acpi_match_device(intel_lpss_acpi_ids, &pdev->dev); - if (!id) + data = device_get_match_data(&pdev->dev); + if (!data) return -ENODEV; - info = devm_kmemdup(&pdev->dev, (void *)id->driver_data, sizeof(*info), - GFP_KERNEL); + info = devm_kmemdup(&pdev->dev, data, sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c index 709b0fb4419d..94042bfe7dbf 100644 --- a/drivers/mfd/intel-lpss-pci.c +++ b/drivers/mfd/intel-lpss-pci.c @@ -30,6 +30,7 @@ static const struct pci_device_id ignore_resource_conflicts_ids[] = { static int intel_lpss_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { + const struct intel_lpss_platform_info *data = (void *)id->driver_data; struct intel_lpss_platform_info *info; int ret; @@ -41,8 +42,7 @@ static int intel_lpss_pci_probe(struct pci_dev *pdev, if (ret) return ret; - info = devm_kmemdup(&pdev->dev, (void *)id->driver_data, sizeof(*info), - GFP_KERNEL); + info = devm_kmemdup(&pdev->dev, data, sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; From patchwork Fri Nov 24 19:31:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 169563 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1498066vqx; Fri, 24 Nov 2023 12:03:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IEuMAAkcFgiXE1qA4P5VMOtNOv2hXipV0wdCVW99Hm5sJV5PZ0gRA0g4JWe9zPSORTK0AB+ X-Received: by 2002:a05:6871:799d:b0:1f4:d347:df06 with SMTP id pb29-20020a056871799d00b001f4d347df06mr4575899oac.29.1700856223532; Fri, 24 Nov 2023 12:03:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700856223; cv=none; d=google.com; s=arc-20160816; b=pGSt3DIIDiopTKgJIA36afaNAAgqx/aAnD9nzNzjdCplJ5kWf0EKdwOIOcb1m4FdNP nc8LPy032oBezF8IsQ6/l+2vFSZXQAFJJL/NLMytkFbAX8r+OgxebrC/0OVrVu9Qkjdm N29R/cX+f3m6bVkDVuxn/YlPY5niT2+XQ9PD5/Arpu5E1XZOyW0k8LaP1o8PAIzw/a6O Uyb8xDiizzXdrqoQSNpCAdFooYNODCYXYXIxrG0+yW90tJEntl57kb1GFsQq4rGrGm8U t4UaBxtFPqCg8hX7a09pRtnM88HEHW5lYtFIfOwwqCKh54Lj/ZiezuG0XxsTqh3IysrD AktA== 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=wkQyY3MIIvZYf7RbkPTMPlYjz9Ll3GekUtMZVNajf2Y=; fh=NrWLvEVUW8ufGou/ZOuWZl9yKC+ByU+oxgRUdXMV2yI=; b=BWwMY2tyDgPPi2nCmMRwC4YOgHUfOIh//x/i5Q/xrCAXv6JFvOPGsap52n/QyGfbwI iJBk2m05+iR/35O+SkMZ60St6/MRkXXqdP4ErzLfn1mK02Qkns+0IsVM53ZrBYdHruM8 omCmCnQnhmJi+jVxPwSQP1q6zV22PUKemVwVsR1QpOgvBuIq/j9xTIPA4upz7IuxOuOE qzqGiTjkZQPHHk/wzdK/lYYUOg9w5eHrC1HVz0sNaFtPSZauQheGmji24SKPhZWaLjCa +v+7Pqu0YRt2OntAplD+2NsgYQ2ykJCCtXubtugsUUTRY0L3W46aflHyLEJgHUwelIvN SSoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=A6P2SMjI; 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 r20-20020a05683001d400b006d7ee8415aesi1538943ota.299.2023.11.24.12.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 12:03:43 -0800 (PST) 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=A6P2SMjI; 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 09CCA8026E2F; Fri, 24 Nov 2023 12:03:36 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346123AbjKXUDK (ORCPT + 99 others); Fri, 24 Nov 2023 15:03:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346009AbjKXUDB (ORCPT ); Fri, 24 Nov 2023 15:03:01 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1314910F0 for ; Fri, 24 Nov 2023 12:03:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700856188; x=1732392188; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aWAES+X/gzWAf5tameCWgEEuMqs70/3z8X4l0rA0DAY=; b=A6P2SMjIsyRusVozu3sTtKwbw4QgMTdu8ZivmCg6s6+tWf/IvjseAP50 v+fkygbd8pOarvowIHZV1OLcPWpSVlPz98YrgrguwxEYOx2tIUdxJss8C mvpHqnNZ8KDUOLAuw/341oYZUNxgbY5QQ4oQBgisK32lNryrrA9OiOg3Q r9mbBHBtm7bHXjorWJ31f8F15kH2B8Vgzi77P9sh9uxFQ6Q5i2qr7XtqJ W5xYb15h3k0ukc4+Fyit6QDtY5kCpqlGFgk/dUj0/hN9+uYmC5+jBvTW3 zXvsA7WFPRmM93eaSMd+zqs5gFjwcfSzijCoiQrZRz/n98e0PoOsy8By0 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10904"; a="391338134" X-IronPort-AV: E=Sophos;i="6.04,224,1695711600"; d="scan'208";a="391338134" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2023 12:03:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10904"; a="1014983741" X-IronPort-AV: E=Sophos;i="6.04,224,1695711600"; d="scan'208";a="1014983741" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 24 Nov 2023 12:03:04 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id B2674387; Fri, 24 Nov 2023 22:03:03 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org Cc: Lee Jones Subject: [PATCH v1 3/5] mfd: intel-lpss: Adjust header inclusions Date: Fri, 24 Nov 2023 21:31:26 +0200 Message-ID: <20231124200258.3682979-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231124200258.3682979-1-andriy.shevchenko@linux.intel.com> References: <20231124200258.3682979-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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]); Fri, 24 Nov 2023 12:03:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783477015285660947 X-GMAIL-MSGID: 1783477015285660947 Adjust header inclusions to avoid "proxy" headers and explicitly include what we are using. Signed-off-by: Andy Shevchenko --- drivers/mfd/intel-lpss-acpi.c | 6 +++++- drivers/mfd/intel-lpss-pci.c | 8 ++++++-- drivers/mfd/intel-lpss.c | 17 ++++++++++++----- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c index bba208235754..e4a62cc02cfc 100644 --- a/drivers/mfd/intel-lpss-acpi.c +++ b/drivers/mfd/intel-lpss-acpi.c @@ -8,15 +8,19 @@ * Mika Westerberg */ +#include +#include #include -#include #include #include #include #include #include + #include +#include + #include "intel-lpss.h" static const struct property_entry spt_spi_properties[] = { diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c index 94042bfe7dbf..bc15379afe3b 100644 --- a/drivers/mfd/intel-lpss-pci.c +++ b/drivers/mfd/intel-lpss-pci.c @@ -8,14 +8,18 @@ * Mika Westerberg */ -#include -#include +#include +#include +#include #include #include #include #include + #include +#include + #include "intel-lpss.h" /* Some DSDTs have an unused GEXP ACPI device conflicting with I2C4 resources */ diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c index bbd65da46db6..79ea5e2ad0a6 100644 --- a/drivers/mfd/intel-lpss.c +++ b/drivers/mfd/intel-lpss.c @@ -10,26 +10,33 @@ * Jarkko Nikula */ -#include +#include +#include #include +#include #include #include +#include +#include +#include #include #include #include -#include -#include #include +#include #include #include -#include -#include +#include +#include + #include #include #include "intel-lpss.h" +struct dentry; + #define LPSS_DEV_OFFSET 0x000 #define LPSS_DEV_SIZE 0x200 #define LPSS_PRIV_OFFSET 0x200 From patchwork Fri Nov 24 19:31:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 169560 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1497692vqx; Fri, 24 Nov 2023 12:03:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IHowGZBbf2BG0VO9KdxhfhRlevmwR/gFicSXBLK1ByuiL4bC/wEDB/qKrgQt5i2o2X1yo4V X-Received: by 2002:a05:6a20:431e:b0:189:2e8f:d34d with SMTP id h30-20020a056a20431e00b001892e8fd34dmr5053117pzk.42.1700856199919; Fri, 24 Nov 2023 12:03:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700856199; cv=none; d=google.com; s=arc-20160816; b=NVVqFE3hXGlNC/6OnEXo0Vz+IrSnA4p1bWAGvONtC96W66de4mTuQIC0DNpcy21nG4 rGK4x7dSrqKBDoTH3/AVx2Erx4O9I6E3kiLveLva9ZrVn4qlasY0Pr0D2mN/3MyvrZNi Zfi1AoYn0q9a8VyNZnVlX2gkom2ff3VqwegJQMlKSzQUxW+tMFaj1K9oIUWmG2sWVz+S cl4dPFxI+ZzI+6TFBonzebazmnIpvbF47mLNT51CzTkQ4JDeXTebQCkgg3I5Lqy7SbUi 8o+EgViKZdJ3++a93kiA6AZ+DNUCiZTkEq+QpH8qruqfIQRpfwKsgUntbR+C/FgeYGq/ AQ4g== 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=lKVx7t/iuWQkA/acJeNklBjKS7hzvmifZvCihMlnq6M=; fh=NrWLvEVUW8ufGou/ZOuWZl9yKC+ByU+oxgRUdXMV2yI=; b=ZxwqDf3RjVe59C20laGQlHa+Us/LzovTxe8A+4Ucbk31/emMUVqKSlZfWGVa12ANZw O1ufqeurPVYVUIpL7Uk7O7+iCdNVrQC9bmJEtlpL/ZqZTS8oGIxniEox9JK5rWUQDDGT XMrA4xdwnYKokDTMc+yv96jngci+KynA9Ssd/zCOWelsJJMbztieKCHomhW2Atc0aInB hS9rNT32xga1i6tL8Ueqico7mTJ7Vj++JicHptd++DAwBoehM+mu60px2z6rbegTnW3C qvHFcZ42mbm2vePkE5romdCm87WRNAf12wsTg6MTc8EBEdZt/jwVGLUsBo3PS3tmHX+U zzvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=i3A6gwIE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id s1-20020a056a0008c100b006cb6338dd60si4360685pfu.19.2023.11.24.12.03.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 12:03:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=i3A6gwIE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id C3D0D804E69F; Fri, 24 Nov 2023 12:03:18 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346102AbjKXUDF (ORCPT + 99 others); Fri, 24 Nov 2023 15:03:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232516AbjKXUDB (ORCPT ); Fri, 24 Nov 2023 15:03:01 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A73F170B for ; Fri, 24 Nov 2023 12:03:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700856187; x=1732392187; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wjIuz3y60umWAMMG08jdscB6p7782TQh9CFOLAOBo9c=; b=i3A6gwIEG2nND+KvFE1ZCpH22Gw2ThnHgYEHcFx6Y6n9Jn5m0qHz6JYq kaAF1Ici8mRqiBf5e6DKX0dqt3gVihE6xItWVSBndpDK5Cl/NrsV08pq2 8B235rfTCSaMZnv+1eoqtG+x9QDhn8HZweAP+2ZRd4ZnNYNzFhOXv41so XxUUtmUEunmXmPTjaOKK9JXZm3UNCc2FH38C1p+6txlBGQdziH4okcnKd aj1q+sMuTOyNQvdmpTrX6CSh57EbORz/0bgU3wIpTmEJrABiG+CTWzPDb xuYUWW2j9hpPfaA3ZCfM5yUoV6kMZJzN9z+krZpFnswLbcv0zjWTKTxl8 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10904"; a="391338128" X-IronPort-AV: E=Sophos;i="6.04,224,1695711600"; d="scan'208";a="391338128" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2023 12:03:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10904"; a="1014983739" X-IronPort-AV: E=Sophos;i="6.04,224,1695711600"; d="scan'208";a="1014983739" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 24 Nov 2023 12:03:04 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id B8079305; Fri, 24 Nov 2023 22:03:03 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org Cc: Lee Jones Subject: [PATCH v1 4/5] mfd: intel-lpss: Move exported symbols to INTEL_LPSS namespace Date: Fri, 24 Nov 2023 21:31:27 +0200 Message-ID: <20231124200258.3682979-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231124200258.3682979-1-andriy.shevchenko@linux.intel.com> References: <20231124200258.3682979-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Fri, 24 Nov 2023 12:03:18 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783476990548782026 X-GMAIL-MSGID: 1783476990548782026 Avoid unnecessary pollution of the global symbol namespace by moving library functions in to a specific namespace and import that into the drivers that make use of the functions. For more info: https://lwn.net/Articles/760045/ Signed-off-by: Andy Shevchenko --- drivers/mfd/intel-lpss-acpi.c | 1 + drivers/mfd/intel-lpss-pci.c | 1 + drivers/mfd/intel-lpss.c | 10 +++++----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c index e4a62cc02cfc..a9e2d9308a01 100644 --- a/drivers/mfd/intel-lpss-acpi.c +++ b/drivers/mfd/intel-lpss-acpi.c @@ -223,3 +223,4 @@ MODULE_AUTHOR("Andy Shevchenko "); MODULE_AUTHOR("Mika Westerberg "); MODULE_DESCRIPTION("Intel LPSS ACPI driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(INTEL_LPSS); diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c index bc15379afe3b..e1d89423daa6 100644 --- a/drivers/mfd/intel-lpss-pci.c +++ b/drivers/mfd/intel-lpss-pci.c @@ -603,3 +603,4 @@ MODULE_AUTHOR("Andy Shevchenko "); MODULE_AUTHOR("Mika Westerberg "); MODULE_DESCRIPTION("Intel LPSS PCI driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(INTEL_LPSS); diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c index 79ea5e2ad0a6..4a63703b6da5 100644 --- a/drivers/mfd/intel-lpss.c +++ b/drivers/mfd/intel-lpss.c @@ -456,7 +456,7 @@ int intel_lpss_probe(struct device *dev, return ret; } -EXPORT_SYMBOL_GPL(intel_lpss_probe); +EXPORT_SYMBOL_NS_GPL(intel_lpss_probe, INTEL_LPSS); void intel_lpss_remove(struct device *dev) { @@ -468,7 +468,7 @@ void intel_lpss_remove(struct device *dev) intel_lpss_unregister_clock(lpss); ida_free(&intel_lpss_devid_ida, lpss->devid); } -EXPORT_SYMBOL_GPL(intel_lpss_remove); +EXPORT_SYMBOL_NS_GPL(intel_lpss_remove, INTEL_LPSS); #ifdef CONFIG_PM static int resume_lpss_device(struct device *dev, void *data) @@ -488,7 +488,7 @@ int intel_lpss_prepare(struct device *dev) device_for_each_child_reverse(dev, NULL, resume_lpss_device); return 0; } -EXPORT_SYMBOL_GPL(intel_lpss_prepare); +EXPORT_SYMBOL_NS_GPL(intel_lpss_prepare, INTEL_LPSS); int intel_lpss_suspend(struct device *dev) { @@ -509,7 +509,7 @@ int intel_lpss_suspend(struct device *dev) return 0; } -EXPORT_SYMBOL_GPL(intel_lpss_suspend); +EXPORT_SYMBOL_NS_GPL(intel_lpss_suspend, INTEL_LPSS); int intel_lpss_resume(struct device *dev) { @@ -524,7 +524,7 @@ int intel_lpss_resume(struct device *dev) return 0; } -EXPORT_SYMBOL_GPL(intel_lpss_resume); +EXPORT_SYMBOL_NS_GPL(intel_lpss_resume, INTEL_LPSS); #endif static int __init intel_lpss_init(void) From patchwork Fri Nov 24 19:31:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 169562 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1497889vqx; Fri, 24 Nov 2023 12:03:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IFNtoiSO3vRONBZUC6z0Pfaqc/DF5N9qLbL6g7p0HQPZEGfnQE3zh2Pb2eo3n+35+2MrjA/ X-Received: by 2002:a17:90a:357:b0:280:cd15:9684 with SMTP id 23-20020a17090a035700b00280cd159684mr4295077pjf.37.1700856211153; Fri, 24 Nov 2023 12:03:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700856211; cv=none; d=google.com; s=arc-20160816; b=O93wQdNpZf/6sSXvONP8yiPhbDAwwei7UAoSQRFX1QjXmKW1aNT4AzqXtrfTVhfEmT V8S70emA48o56P+VtOaoYOc2eh6wBNZ04VSpC47XRhBd8dXl5THQCfA4R4SC/dlEG6gb Iy7htIlGwYmf/D4NMrA7XWVx0Bfv4obkOk0jI2iZSscswHt+oPuFJrqmfkOF4dPccbmT GP4cx1wRyVNdv91XKKmIUlheDLYMIN9JdG6Ghaz5sBceZOYSTGl8RF9b1FsvD1aaNwIc 6rlpuRf6svOeDvZYC/03a1MUF/vticpmLgO7au2ozFb9tWuWVowW8f/GInbOdK9thud6 pD/w== 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=NncQFPG0TYQCq+NtFPfEHFVkb1laCrrM0/IlppXEh6I=; fh=NrWLvEVUW8ufGou/ZOuWZl9yKC+ByU+oxgRUdXMV2yI=; b=s1l/DDRB46RaE9R1AAlirhpo8kZcTNHq+eHVCAerHulLVzMkbYd8ZxSpo0tDQvSDio g3gbdmNNJ2fNkeLMaciUOTGOZRqP70eeZXIqtUML4AXAtByUbxtMS4uaRJatA0zyPhNu WEqRZbtqUjh7NV3uPzKRaCYogG+Xq3flgPytNoHpk9QCB6srhkRS4o9BPqMPFxSKK1+p eKwVfb4DSyui5VneDovXQfGb6+DOs+DS8nERB7J+YsTn7hp3Vf2TkqW75Az5J3Clmvqm FjLtETY3zB26vpurIiVyjEgRL6e7rQIWwiMfIdR+FTUUsxTb0YGrs6h/crb++XeFK410 +JQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Ctz+HQQM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id r26-20020a6560da000000b00564929df8besi4201106pgv.568.2023.11.24.12.03.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 12:03:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Ctz+HQQM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id C2548804E71F; Fri, 24 Nov 2023 12:03:29 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346133AbjKXUDM (ORCPT + 99 others); Fri, 24 Nov 2023 15:03:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231671AbjKXUDC (ORCPT ); Fri, 24 Nov 2023 15:03:02 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6833C10F6 for ; Fri, 24 Nov 2023 12:03:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700856188; x=1732392188; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JOd7EwyxD3DRBP7ebSXKK+WZgK+reW2wbBEUTcLsQC8=; b=Ctz+HQQM1eLOo62sJg29LBuDRYkoyNRxrv/7EJoBIU8ns1+RjH2g4Qrw 7lL347lYiUMT7CcHywNAb08Vl2zj/qKQmr1OdIU5R+6hmBR03ds9NoIc2 4oAy0+fSxOXv3KvvHZ+kvJxt8B8OBrPkVg0lzPsEguhs9AiScheqMnZa7 4MDHUlLVEwKD+KvN6V0TvyjCzVO3dUApKgmXN0P6zHhQ8I12vQwAr7ojJ JdnKztrw8yl9NiqOg4efj97YEHJe9vazVZY61q2qfNKsvUfgLzoQKn3Fn bAFgc3GHn1UjWi8NqYuw5/pKwiVWjWKAHHGL/ANUcRy9a+/xvbwrWNqhZ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10904"; a="396366609" X-IronPort-AV: E=Sophos;i="6.04,224,1695711600"; d="scan'208";a="396366609" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2023 12:03:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10904"; a="833763318" X-IronPort-AV: E=Sophos;i="6.04,224,1695711600"; d="scan'208";a="833763318" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 24 Nov 2023 12:03:06 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id CD4B641A; Fri, 24 Nov 2023 22:03:03 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org Cc: Lee Jones Subject: [PATCH v1 5/5] mfd: intel-lpss: Provide Intel LPSS PM ops structure Date: Fri, 24 Nov 2023 21:31:28 +0200 Message-ID: <20231124200258.3682979-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231124200258.3682979-1-andriy.shevchenko@linux.intel.com> References: <20231124200258.3682979-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Fri, 24 Nov 2023 12:03:29 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783477002327670888 X-GMAIL-MSGID: 1783477002327670888 With the help of EXPORT_NS_GPL_DEV_PM_OPS() and other *_PM_OPS() macros we may convert PM ops functions to become static. This also takes into account the PM configuration options such as CONFIG_PM and CONFIG_PM_SLEEP. This all removes a lot of ugly macros and ifdeffery in the driver. Signed-off-by: Andy Shevchenko --- drivers/mfd/intel-lpss-acpi.c | 5 ++--- drivers/mfd/intel-lpss-pci.c | 5 ++--- drivers/mfd/intel-lpss.c | 18 ++++++++++-------- drivers/mfd/intel-lpss.h | 28 +--------------------------- 4 files changed, 15 insertions(+), 41 deletions(-) diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c index a9e2d9308a01..2a83f8678f1d 100644 --- a/drivers/mfd/intel-lpss-acpi.c +++ b/drivers/mfd/intel-lpss-acpi.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -205,15 +206,13 @@ static void intel_lpss_acpi_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); } -static INTEL_LPSS_PM_OPS(intel_lpss_acpi_pm_ops); - static struct platform_driver intel_lpss_acpi_driver = { .probe = intel_lpss_acpi_probe, .remove_new = intel_lpss_acpi_remove, .driver = { .name = "intel-lpss", .acpi_match_table = intel_lpss_acpi_ids, - .pm = &intel_lpss_acpi_pm_ops, + .pm = pm_ptr(&intel_lpss_pm_ops), }, }; diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c index e1d89423daa6..8f5e10817a9c 100644 --- a/drivers/mfd/intel-lpss-pci.c +++ b/drivers/mfd/intel-lpss-pci.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -81,8 +82,6 @@ static void intel_lpss_pci_remove(struct pci_dev *pdev) intel_lpss_remove(&pdev->dev); } -static INTEL_LPSS_PM_OPS(intel_lpss_pci_pm_ops); - static const struct property_entry spt_spi_properties[] = { PROPERTY_ENTRY_U32("intel,spi-pxa2xx-type", LPSS_SPT_SSP), { } @@ -593,7 +592,7 @@ static struct pci_driver intel_lpss_pci_driver = { .probe = intel_lpss_pci_probe, .remove = intel_lpss_pci_remove, .driver = { - .pm = &intel_lpss_pci_pm_ops, + .pm = pm_ptr(&intel_lpss_pm_ops), }, }; diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c index 4a63703b6da5..177915845ba2 100644 --- a/drivers/mfd/intel-lpss.c +++ b/drivers/mfd/intel-lpss.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -470,7 +471,6 @@ void intel_lpss_remove(struct device *dev) } EXPORT_SYMBOL_NS_GPL(intel_lpss_remove, INTEL_LPSS); -#ifdef CONFIG_PM static int resume_lpss_device(struct device *dev, void *data) { if (!dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_SUSPEND)) @@ -479,7 +479,7 @@ static int resume_lpss_device(struct device *dev, void *data) return 0; } -int intel_lpss_prepare(struct device *dev) +static int intel_lpss_prepare(struct device *dev) { /* * Resume both child devices before entering system sleep. This @@ -488,9 +488,8 @@ int intel_lpss_prepare(struct device *dev) device_for_each_child_reverse(dev, NULL, resume_lpss_device); return 0; } -EXPORT_SYMBOL_NS_GPL(intel_lpss_prepare, INTEL_LPSS); -int intel_lpss_suspend(struct device *dev) +static int intel_lpss_suspend(struct device *dev) { struct intel_lpss *lpss = dev_get_drvdata(dev); unsigned int i; @@ -509,9 +508,8 @@ int intel_lpss_suspend(struct device *dev) return 0; } -EXPORT_SYMBOL_NS_GPL(intel_lpss_suspend, INTEL_LPSS); -int intel_lpss_resume(struct device *dev) +static int intel_lpss_resume(struct device *dev) { struct intel_lpss *lpss = dev_get_drvdata(dev); unsigned int i; @@ -524,8 +522,12 @@ int intel_lpss_resume(struct device *dev) return 0; } -EXPORT_SYMBOL_NS_GPL(intel_lpss_resume, INTEL_LPSS); -#endif + +EXPORT_NS_GPL_DEV_PM_OPS(intel_lpss_pm_ops, INTEL_LPSS) = { + .prepare = pm_sleep_ptr(&intel_lpss_prepare), + LATE_SYSTEM_SLEEP_PM_OPS(intel_lpss_suspend, intel_lpss_resume) + RUNTIME_PM_OPS(intel_lpss_suspend, intel_lpss_resume, NULL) +}; static int __init intel_lpss_init(void) { diff --git a/drivers/mfd/intel-lpss.h b/drivers/mfd/intel-lpss.h index 062ce95b68b9..c1d72b117ed5 100644 --- a/drivers/mfd/intel-lpss.h +++ b/drivers/mfd/intel-lpss.h @@ -30,32 +30,6 @@ int intel_lpss_probe(struct device *dev, const struct intel_lpss_platform_info *info); void intel_lpss_remove(struct device *dev); -#ifdef CONFIG_PM -int intel_lpss_prepare(struct device *dev); -int intel_lpss_suspend(struct device *dev); -int intel_lpss_resume(struct device *dev); - -#ifdef CONFIG_PM_SLEEP -#define INTEL_LPSS_SLEEP_PM_OPS \ - .prepare = intel_lpss_prepare, \ - SET_LATE_SYSTEM_SLEEP_PM_OPS(intel_lpss_suspend, intel_lpss_resume) -#else -#define INTEL_LPSS_SLEEP_PM_OPS -#endif - -#define INTEL_LPSS_RUNTIME_PM_OPS \ - .runtime_suspend = intel_lpss_suspend, \ - .runtime_resume = intel_lpss_resume, - -#else /* !CONFIG_PM */ -#define INTEL_LPSS_SLEEP_PM_OPS -#define INTEL_LPSS_RUNTIME_PM_OPS -#endif /* CONFIG_PM */ - -#define INTEL_LPSS_PM_OPS(name) \ -const struct dev_pm_ops name = { \ - INTEL_LPSS_SLEEP_PM_OPS \ - INTEL_LPSS_RUNTIME_PM_OPS \ -} +extern const struct dev_pm_ops intel_lpss_pm_ops; #endif /* __MFD_INTEL_LPSS_H */