From nobody Wed Jul 1 03:10:20 2026 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 4FFFCC433F5 for ; Tue, 4 Jan 2022 06:22:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232970AbiADGWU (ORCPT ); Tue, 4 Jan 2022 01:22:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232959AbiADGWT (ORCPT ); Tue, 4 Jan 2022 01:22:19 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E844C061761 for ; Mon, 3 Jan 2022 22:22:19 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id v13so31344312pfi.3 for ; Mon, 03 Jan 2022 22:22:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q5skJ1adnSEqbAhZu27y857FPm6OsY3ZtDrlCEr6GDE=; b=ftwK8EdoU9ZeKpKmJ11tgcPKaqUNqAIy2Ec+KkJ5pZ3Cewhxpcxz0AbnOl7KDH7ZbC /aHV4XqXShxDL2q4YOuwkdT2GVGu1ojl11sBm7m7Z4qpM/fPzPhEWAb3U4mW8DMCscjR YkN1RCBDG7k7ckc0eT1zh2qTmI9afzPU3CA/U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q5skJ1adnSEqbAhZu27y857FPm6OsY3ZtDrlCEr6GDE=; b=CrDgi68X3P6VM/IiberQQJEyGnPNhJDtz/+NMZr0k+tXgqgv0ZF3QM4IbDpZYRwdyq sfnWhrTEID2VzTlG3xmurqi7hS8+i/6fqO7pPgF3YiS9c8XQS4MxCCPZnsaOEVnxmC2A J3JivAraBrk2GyBsqHI/ejVgtDc+D3hTiFK9nuNk8McDunbH9slkrSRzxus3ll0wVAkU qXIU3M60KQDVRc63KzoMY0TO1AJwvFwlaUBRbsNiheZZp4ZZtXmsj+68c9hZUMZ0OE1b 9q0KWKbDkgOf0aVwZEaBnAL1dbZM5eXrBcNQFw4b6hQtNfwT8/eF2UYrC1+Z3tniEEO6 F0XA== X-Gm-Message-State: AOAM531OQ3Vb7nE+GImqckej1UwOs7IXY0ACwWgrOTgiwLYD/NuXbZ+H qSvT1GVaAdHnEGkJrUZPgNNkkQ== X-Google-Smtp-Source: ABdhPJxoRU7e2ecABqN4Y0dXUonGnCMKa9/ahrm1WNKt6rnixKdBv4hekN2AXZ8kbvsYRd+jDP6m4Q== X-Received: by 2002:a05:6a00:168b:b0:4a8:d88:9cd with SMTP id k11-20020a056a00168b00b004a80d8809cdmr49113394pfc.11.1641277338656; Mon, 03 Jan 2022 22:22:18 -0800 (PST) Received: from localhost ([2620:15c:202:201:6f47:183c:871a:2a1a]) by smtp.gmail.com with UTF8SMTPSA id r13sm35029641pga.29.2022.01.03.22.22.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Jan 2022 22:22:18 -0800 (PST) From: Gwendal Grignou To: bleung@chromium.org, groeck@chromium.org Cc: linux-kernel@vger.kernel.org, Gwendal Grignou Subject: [PATCH 1/3] plaform/chrome: remove SET_SYSTEM_SLEEP_PM_OPS Date: Mon, 3 Jan 2022 22:22:11 -0800 Message-Id: <20220104062213.2365356-2-gwendal@chromium.org> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog In-Reply-To: <20220104062213.2365356-1-gwendal@chromium.org> References: <20220104062213.2365356-1-gwendal@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" commit 296282fca791 ("PM: core: Add new *_PM_OPS macros, deprecate old ones= ") replaces SET_SIMPLE_DEV_PM_OPS with DEFINE_SIMPLE_DEV_PM_OPS. Use sed and a cocci script to replace the macro and remove __maybe_unused: @Replacement@ identifier operation; identifier suspend, resume; @@ - static const struct dev_pm_ops operation =3D { SET_SYSTEM_SLEEP_PM_OPS(su= spend, resume) }; + gg_fc operation =3D gg_arg(suspend, resume); @@ identifier Replacement.suspend; identifier dev; @@ - __maybe_unused suspend(struct device* dev ) { ... } @@ identifier Replacement.resume; identifier dev; @@ - __maybe_unused resume(struct device* dev ) { ... } @@ identifier Replacement.operation; @@ - &operation + pm_sleep_ptr(&operation) spatch -sp_file no_SET_SYSTEM_SLEEP_PM_OPS.cocci -dir drivers/platform/chro= me | patch -p 1 -d drivers/platform/chrome sed -i 's/gg_fc \(.*\) =3D gg_arg(/DEFINE_SIMPLE_DEV_PM_OPS(\1, /' $(git diff --name-only) Signed-off-by: Gwendal Grignou --- drivers/platform/chrome/cros_ec_typec.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chr= ome/cros_ec_typec.c index 5de0bfb0bc4d99..c3d449f9e38bc6 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -1129,7 +1129,7 @@ static int cros_typec_probe(struct platform_device *p= dev) return ret; } =20 -static int __maybe_unused cros_typec_suspend(struct device *dev) +static int cros_typec_suspend(struct device *dev) { struct cros_typec_data *typec =3D dev_get_drvdata(dev); =20 @@ -1138,7 +1138,7 @@ static int __maybe_unused cros_typec_suspend(struct d= evice *dev) return 0; } =20 -static int __maybe_unused cros_typec_resume(struct device *dev) +static int cros_typec_resume(struct device *dev) { struct cros_typec_data *typec =3D dev_get_drvdata(dev); =20 @@ -1148,16 +1148,14 @@ static int __maybe_unused cros_typec_resume(struct = device *dev) return 0; } =20 -static const struct dev_pm_ops cros_typec_pm_ops =3D { - SET_SYSTEM_SLEEP_PM_OPS(cros_typec_suspend, cros_typec_resume) -}; +DEFINE_SIMPLE_DEV_PM_OPS(cros_typec_pm_ops, cros_typec_suspend, cros_typec= _resume); =20 static struct platform_driver cros_typec_driver =3D { .driver =3D { .name =3D DRV_NAME, .acpi_match_table =3D ACPI_PTR(cros_typec_acpi_id), .of_match_table =3D of_match_ptr(cros_typec_of_match), - .pm =3D &cros_typec_pm_ops, + .pm =3D pm_sleep_ptr(&cros_typec_pm_ops), }, .probe =3D cros_typec_probe, }; --=20 2.34.1.448.ga2b2bfdf31-goog From nobody Wed Jul 1 03:10:20 2026 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 5EA05C433EF for ; Tue, 4 Jan 2022 06:22:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232982AbiADGWW (ORCPT ); Tue, 4 Jan 2022 01:22:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232973AbiADGWU (ORCPT ); Tue, 4 Jan 2022 01:22:20 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81E97C061784 for ; Mon, 3 Jan 2022 22:22:20 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id c9-20020a17090a1d0900b001b2b54bd6c5so18171704pjd.1 for ; Mon, 03 Jan 2022 22:22:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SANnKmmJDM4V0xG/YqXU9hEr6097MRlo3+jmVxZzn54=; b=GLjmf+BlsK1SKFfdW+0Q8lhUzgb2dtFor7ki1hvavjJ9qlDL2oLZAmwLK15zmplwLe x1a03KdQ/lbGiySyKXqinOaYArYNQKDt/7wAxB3DgLYXg3u0ri/uAM1BpwjYxzvJJf07 egkGB4F9aaxh19UcnMORqFH2mmcURr84Xofww= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SANnKmmJDM4V0xG/YqXU9hEr6097MRlo3+jmVxZzn54=; b=b3IFZHHG/QTnElx5AGcEz38o9FKoDZor1i00+KVuwDGvZlXtA1qWoaVLCSLlX1q5QN RhpO7QrwnV3FTv/8BEyRyaDDXNKqgm55XVxAEXMpY9UB0GmEmUtw8Cz+BNI9uIsPfViA PEDL2vmCWNJ6dc5YID+Jtv3PfQfxpO0hNERVk9cIjvJIO2Q+6zdrl/2OwDB7wxxS+wlZ u0dzK9fNCZuoLDeDp4JbjVwyGBydZJzXi6z9LoXx1hS/L18n0Lba8ODokedMUYSCaP5g adL0QpTntnrBwWo0gx+sSMP0/3PEBdgVTa+9Ua0QlbvmDfx3fbh7XTW+d95Dd9oqyKat mGQg== X-Gm-Message-State: AOAM533U/p7+FrLmAmLraTvCMIzmSadDD4folzrTSAZnvRnqWP49Z0OH M2laEDb7FwY0m4/lOJJdazzN5A== X-Google-Smtp-Source: ABdhPJx9USMKeDdBbF/7dLHBuTS6o4gWeC6aQsi3O6uHRuzpUKjKFK4fk+7IAaOk4uPdAnYNa79KxA== X-Received: by 2002:a17:90b:1e45:: with SMTP id pi5mr58502144pjb.64.1641277340002; Mon, 03 Jan 2022 22:22:20 -0800 (PST) Received: from localhost ([2620:15c:202:201:6f47:183c:871a:2a1a]) by smtp.gmail.com with UTF8SMTPSA id k6sm39779334pfu.96.2022.01.03.22.22.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Jan 2022 22:22:19 -0800 (PST) From: Gwendal Grignou To: bleung@chromium.org, groeck@chromium.org Cc: linux-kernel@vger.kernel.org, Gwendal Grignou Subject: [PATCH 2/3] plaform/chrome: Remove SIMPLE_DEV_PM_OPS Date: Mon, 3 Jan 2022 22:22:12 -0800 Message-Id: <20220104062213.2365356-3-gwendal@chromium.org> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog In-Reply-To: <20220104062213.2365356-1-gwendal@chromium.org> References: <20220104062213.2365356-1-gwendal@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" commit 296282fca791 ("PM: core: Add new *_PM_OPS macros, deprecate old ones= ") replaces SIMPLE_DEV_PM_OPS with DEFINE_SIMPLE_DEV_PM_OPS. Use sed and a cocci script to replace the macro and remove __maybe_unused: @ Replacement @ identifier operation; identifier suspend, resume; @@ gg_type operation =3D gg_arg(suspend, resume); @@ identifier Replacement.suspend; identifier dev; @@ - __maybe_unused suspend(struct device* dev ) { ... } @@ identifier Replacement.resume; identifier dev; @@ - __maybe_unused resume(struct device* dev ) { ... } @@ identifier Replacement.operation; @@ - &operation + pm_sleep_ptr(&operation) find drivers/platform/chrome -type f -name \*.c \ -exec sed -i 's/static SIMPLE_DEV_PM_OPS(\(.*\), */gg_type \1 =3D gg_arg(/'= {} \+ spatch -sp_file no_SIMPLE_DEV_PM_OPS.cocci -dir drivers/platform/chrome | \ patch -p 1 -d drivers/platform/chrome/ sed -i 's/gg_type \(.*\) =3D gg_arg(/DEFINE_SIMPLE_DEV_PM_OPS(\1, /' $(git = diff --name-only) Remove #ifdef CONFIG_PM_SLEEP when not needed anymore. Test with make allmodconfig, with CONFIG_PM_SLEEP set to 'y' and 'n'. Signed-off-by: Gwendal Grignou --- drivers/platform/chrome/chromeos_tbmc.c | 6 +++--- drivers/platform/chrome/cros_ec_debugfs.c | 8 ++++---- drivers/platform/chrome/cros_ec_ishtp.c | 8 ++++---- drivers/platform/chrome/cros_ec_lightbar.c | 8 ++++---- drivers/platform/chrome/cros_ec_rpmsg.c | 6 ++---- drivers/platform/chrome/cros_ec_sensorhub.c | 6 ++---- drivers/platform/chrome/cros_ec_spi.c | 6 ++---- drivers/platform/chrome/cros_usbpd_logger.c | 8 ++++---- 8 files changed, 25 insertions(+), 31 deletions(-) diff --git a/drivers/platform/chrome/chromeos_tbmc.c b/drivers/platform/chr= ome/chromeos_tbmc.c index d1cf8f3463ce3b..c10f39b3eb53be 100644 --- a/drivers/platform/chrome/chromeos_tbmc.c +++ b/drivers/platform/chrome/chromeos_tbmc.c @@ -38,7 +38,7 @@ static int chromeos_tbmc_query_switch(struct acpi_device = *adev, return 0; } =20 -static __maybe_unused int chromeos_tbmc_resume(struct device *dev) +static int chromeos_tbmc_resume(struct device *dev) { struct acpi_device *adev =3D to_acpi_device(dev); =20 @@ -101,7 +101,7 @@ static const struct acpi_device_id chromeos_tbmc_acpi_d= evice_ids[] =3D { }; MODULE_DEVICE_TABLE(acpi, chromeos_tbmc_acpi_device_ids); =20 -static SIMPLE_DEV_PM_OPS(chromeos_tbmc_pm_ops, NULL, +DEFINE_SIMPLE_DEV_PM_OPS(chromeos_tbmc_pm_ops, NULL, chromeos_tbmc_resume); =20 static struct acpi_driver chromeos_tbmc_driver =3D { @@ -112,7 +112,7 @@ static struct acpi_driver chromeos_tbmc_driver =3D { .add =3D chromeos_tbmc_add, .notify =3D chromeos_tbmc_notify, }, - .drv.pm =3D &chromeos_tbmc_pm_ops, + .drv.pm =3D pm_sleep_ptr(&chromeos_tbmc_pm_ops), }; =20 module_acpi_driver(chromeos_tbmc_driver); diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/c= hrome/cros_ec_debugfs.c index 272c89837d745a..c72c13ad7943fc 100644 --- a/drivers/platform/chrome/cros_ec_debugfs.c +++ b/drivers/platform/chrome/cros_ec_debugfs.c @@ -491,7 +491,7 @@ static int cros_ec_debugfs_remove(struct platform_devic= e *pd) return 0; } =20 -static int __maybe_unused cros_ec_debugfs_suspend(struct device *dev) +static int cros_ec_debugfs_suspend(struct device *dev) { struct cros_ec_dev *ec =3D dev_get_drvdata(dev); =20 @@ -501,7 +501,7 @@ static int __maybe_unused cros_ec_debugfs_suspend(struc= t device *dev) return 0; } =20 -static int __maybe_unused cros_ec_debugfs_resume(struct device *dev) +static int cros_ec_debugfs_resume(struct device *dev) { struct cros_ec_dev *ec =3D dev_get_drvdata(dev); =20 @@ -511,13 +511,13 @@ static int __maybe_unused cros_ec_debugfs_resume(stru= ct device *dev) return 0; } =20 -static SIMPLE_DEV_PM_OPS(cros_ec_debugfs_pm_ops, +DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_debugfs_pm_ops, cros_ec_debugfs_suspend, cros_ec_debugfs_resume); =20 static struct platform_driver cros_ec_debugfs_driver =3D { .driver =3D { .name =3D DRV_NAME, - .pm =3D &cros_ec_debugfs_pm_ops, + .pm =3D pm_sleep_ptr(&cros_ec_debugfs_pm_ops), }, .probe =3D cros_ec_debugfs_probe, .remove =3D cros_ec_debugfs_remove, diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chr= ome/cros_ec_ishtp.c index 4020b8354bae90..0f14f5782bee25 100644 --- a/drivers/platform/chrome/cros_ec_ishtp.c +++ b/drivers/platform/chrome/cros_ec_ishtp.c @@ -739,7 +739,7 @@ static int cros_ec_ishtp_reset(struct ishtp_cl_device *= cl_device) * * Return: 0 for success, negative error code for failure. */ -static int __maybe_unused cros_ec_ishtp_suspend(struct device *device) +static int cros_ec_ishtp_suspend(struct device *device) { struct ishtp_cl_device *cl_device =3D ishtp_dev_to_cl_device(device); struct ishtp_cl *cros_ish_cl =3D ishtp_get_drvdata(cl_device); @@ -754,7 +754,7 @@ static int __maybe_unused cros_ec_ishtp_suspend(struct = device *device) * * Return: 0 for success, negative error code for failure. */ -static int __maybe_unused cros_ec_ishtp_resume(struct device *device) +static int cros_ec_ishtp_resume(struct device *device) { struct ishtp_cl_device *cl_device =3D ishtp_dev_to_cl_device(device); struct ishtp_cl *cros_ish_cl =3D ishtp_get_drvdata(cl_device); @@ -763,7 +763,7 @@ static int __maybe_unused cros_ec_ishtp_resume(struct d= evice *device) return cros_ec_resume(client_data->ec_dev); } =20 -static SIMPLE_DEV_PM_OPS(cros_ec_ishtp_pm_ops, cros_ec_ishtp_suspend, +DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_ishtp_pm_ops, cros_ec_ishtp_suspend, cros_ec_ishtp_resume); =20 static struct ishtp_cl_driver cros_ec_ishtp_driver =3D { @@ -773,7 +773,7 @@ static struct ishtp_cl_driver cros_ec_ishtp_driver =3D { .remove =3D cros_ec_ishtp_remove, .reset =3D cros_ec_ishtp_reset, .driver =3D { - .pm =3D &cros_ec_ishtp_pm_ops, + .pm =3D pm_sleep_ptr(&cros_ec_ishtp_pm_ops), }, }; =20 diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/= chrome/cros_ec_lightbar.c index 469dfc7a4a0302..52647d6804fc30 100644 --- a/drivers/platform/chrome/cros_ec_lightbar.c +++ b/drivers/platform/chrome/cros_ec_lightbar.c @@ -574,7 +574,7 @@ static int cros_ec_lightbar_remove(struct platform_devi= ce *pd) return 0; } =20 -static int __maybe_unused cros_ec_lightbar_resume(struct device *dev) +static int cros_ec_lightbar_resume(struct device *dev) { struct cros_ec_dev *ec_dev =3D dev_get_drvdata(dev->parent); =20 @@ -584,7 +584,7 @@ static int __maybe_unused cros_ec_lightbar_resume(struc= t device *dev) return lb_send_empty_cmd(ec_dev, LIGHTBAR_CMD_RESUME); } =20 -static int __maybe_unused cros_ec_lightbar_suspend(struct device *dev) +static int cros_ec_lightbar_suspend(struct device *dev) { struct cros_ec_dev *ec_dev =3D dev_get_drvdata(dev->parent); =20 @@ -594,13 +594,13 @@ static int __maybe_unused cros_ec_lightbar_suspend(st= ruct device *dev) return lb_send_empty_cmd(ec_dev, LIGHTBAR_CMD_SUSPEND); } =20 -static SIMPLE_DEV_PM_OPS(cros_ec_lightbar_pm_ops, +DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_lightbar_pm_ops, cros_ec_lightbar_suspend, cros_ec_lightbar_resume); =20 static struct platform_driver cros_ec_lightbar_driver =3D { .driver =3D { .name =3D DRV_NAME, - .pm =3D &cros_ec_lightbar_pm_ops, + .pm =3D pm_sleep_ptr(&cros_ec_lightbar_pm_ops), }, .probe =3D cros_ec_lightbar_probe, .remove =3D cros_ec_lightbar_remove, diff --git a/drivers/platform/chrome/cros_ec_rpmsg.c b/drivers/platform/chr= ome/cros_ec_rpmsg.c index d96d15b8ca946d..c8afb152673070 100644 --- a/drivers/platform/chrome/cros_ec_rpmsg.c +++ b/drivers/platform/chrome/cros_ec_rpmsg.c @@ -266,7 +266,6 @@ static void cros_ec_rpmsg_remove(struct rpmsg_device *r= pdev) cancel_work_sync(&ec_rpmsg->host_event_work); } =20 -#ifdef CONFIG_PM_SLEEP static int cros_ec_rpmsg_suspend(struct device *dev) { struct cros_ec_device *ec_dev =3D dev_get_drvdata(dev); @@ -280,9 +279,8 @@ static int cros_ec_rpmsg_resume(struct device *dev) =20 return cros_ec_resume(ec_dev); } -#endif =20 -static SIMPLE_DEV_PM_OPS(cros_ec_rpmsg_pm_ops, cros_ec_rpmsg_suspend, +DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_rpmsg_pm_ops, cros_ec_rpmsg_suspend, cros_ec_rpmsg_resume); =20 static const struct of_device_id cros_ec_rpmsg_of_match[] =3D { @@ -295,7 +293,7 @@ static struct rpmsg_driver cros_ec_driver_rpmsg =3D { .drv =3D { .name =3D "cros-ec-rpmsg", .of_match_table =3D cros_ec_rpmsg_of_match, - .pm =3D &cros_ec_rpmsg_pm_ops, + .pm =3D pm_sleep_ptr(&cros_ec_rpmsg_pm_ops), }, .probe =3D cros_ec_rpmsg_probe, .remove =3D cros_ec_rpmsg_remove, diff --git a/drivers/platform/chrome/cros_ec_sensorhub.c b/drivers/platform= /chrome/cros_ec_sensorhub.c index 31fb8bdaad5a35..5e05ca6cdc2841 100644 --- a/drivers/platform/chrome/cros_ec_sensorhub.c +++ b/drivers/platform/chrome/cros_ec_sensorhub.c @@ -216,7 +216,6 @@ static int cros_ec_sensorhub_probe(struct platform_devi= ce *pdev) return 0; } =20 -#ifdef CONFIG_PM_SLEEP /* * When the EC is suspending, we must stop sending interrupt, * we may use the same interrupt line for waking up the device. @@ -241,16 +240,15 @@ static int cros_ec_sensorhub_resume(struct device *de= v) return cros_ec_sensorhub_ring_fifo_enable(sensorhub, true); return 0; } -#endif =20 -static SIMPLE_DEV_PM_OPS(cros_ec_sensorhub_pm_ops, +DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_sensorhub_pm_ops, cros_ec_sensorhub_suspend, cros_ec_sensorhub_resume); =20 static struct platform_driver cros_ec_sensorhub_driver =3D { .driver =3D { .name =3D DRV_NAME, - .pm =3D &cros_ec_sensorhub_pm_ops, + .pm =3D pm_sleep_ptr(&cros_ec_sensorhub_pm_ops), }, .probe =3D cros_ec_sensorhub_probe, }; diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrom= e/cros_ec_spi.c index 14c4046fa04d52..51db572c8166af 100644 --- a/drivers/platform/chrome/cros_ec_spi.c +++ b/drivers/platform/chrome/cros_ec_spi.c @@ -793,7 +793,6 @@ static int cros_ec_spi_remove(struct spi_device *spi) return cros_ec_unregister(ec_dev); } =20 -#ifdef CONFIG_PM_SLEEP static int cros_ec_spi_suspend(struct device *dev) { struct cros_ec_device *ec_dev =3D dev_get_drvdata(dev); @@ -807,9 +806,8 @@ static int cros_ec_spi_resume(struct device *dev) =20 return cros_ec_resume(ec_dev); } -#endif =20 -static SIMPLE_DEV_PM_OPS(cros_ec_spi_pm_ops, cros_ec_spi_suspend, +DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_spi_pm_ops, cros_ec_spi_suspend, cros_ec_spi_resume); =20 static const struct of_device_id cros_ec_spi_of_match[] =3D { @@ -828,7 +826,7 @@ static struct spi_driver cros_ec_driver_spi =3D { .driver =3D { .name =3D "cros-ec-spi", .of_match_table =3D cros_ec_spi_of_match, - .pm =3D &cros_ec_spi_pm_ops, + .pm =3D pm_sleep_ptr(&cros_ec_spi_pm_ops), }, .probe =3D cros_ec_spi_probe, .remove =3D cros_ec_spi_remove, diff --git a/drivers/platform/chrome/cros_usbpd_logger.c b/drivers/platform= /chrome/cros_usbpd_logger.c index d16931203d8216..9df5a146df2fc0 100644 --- a/drivers/platform/chrome/cros_usbpd_logger.c +++ b/drivers/platform/chrome/cros_usbpd_logger.c @@ -229,7 +229,7 @@ static int cros_usbpd_logger_remove(struct platform_dev= ice *pd) return 0; } =20 -static int __maybe_unused cros_usbpd_logger_resume(struct device *dev) +static int cros_usbpd_logger_resume(struct device *dev) { struct logger_data *logger =3D dev_get_drvdata(dev); =20 @@ -239,7 +239,7 @@ static int __maybe_unused cros_usbpd_logger_resume(stru= ct device *dev) return 0; } =20 -static int __maybe_unused cros_usbpd_logger_suspend(struct device *dev) +static int cros_usbpd_logger_suspend(struct device *dev) { struct logger_data *logger =3D dev_get_drvdata(dev); =20 @@ -248,13 +248,13 @@ static int __maybe_unused cros_usbpd_logger_suspend(s= truct device *dev) return 0; } =20 -static SIMPLE_DEV_PM_OPS(cros_usbpd_logger_pm_ops, cros_usbpd_logger_suspe= nd, +DEFINE_SIMPLE_DEV_PM_OPS(cros_usbpd_logger_pm_ops, cros_usbpd_logger_suspe= nd, cros_usbpd_logger_resume); =20 static struct platform_driver cros_usbpd_logger_driver =3D { .driver =3D { .name =3D DRV_NAME, - .pm =3D &cros_usbpd_logger_pm_ops, + .pm =3D pm_sleep_ptr(&cros_usbpd_logger_pm_ops), }, .probe =3D cros_usbpd_logger_probe, .remove =3D cros_usbpd_logger_remove, --=20 2.34.1.448.ga2b2bfdf31-goog From nobody Wed Jul 1 03:10:20 2026 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 2AB24C433F5 for ; Tue, 4 Jan 2022 06:22:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233042AbiADGWc (ORCPT ); Tue, 4 Jan 2022 01:22:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232959AbiADGWV (ORCPT ); Tue, 4 Jan 2022 01:22:21 -0500 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1B65C061784 for ; Mon, 3 Jan 2022 22:22:21 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id b1-20020a17090a990100b001b14bd47532so2117192pjp.0 for ; Mon, 03 Jan 2022 22:22:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YL2eZRWZPza3fG+cUhkNkFtKht4RCVGdGOYrobm8hvc=; b=bXAReRekp3Ch5av9UEJjYPsdngGJOCahZMQGNdCz3lTvobQA6mT8UOkf1LNLLs+Bdm FDlbw9X2318kQNdNB3JuK/xotBqNVZ1ka0dWRbXyeitE+LEhmwRAMtRXZkRGuAgexhPx qlu7/5ER7MxAIc69mCi7lwwbDMhzOD+lGG0HU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YL2eZRWZPza3fG+cUhkNkFtKht4RCVGdGOYrobm8hvc=; b=EcrVqQjeBUBEx1UkQicygAVM/bsTSo6DEqxisyt1dX1oNJ8h5zVqd/4SmYl4Y/YjN2 v/PVaW4ZzA3Sanzd8TL62zrQfZrvi5uJp0z0v9udsaRfbskNDdUjElaPgoKbSqVsKo71 SuJuKzx6RtUfwCwL8NYwtxxsuzHFoa/V0UEKWOHcdRLj1A6kkRGSrUri+I2kL06U/wLV 54K8SaJ2tS7qf8CVWmdUmeeIWGRmhN+7pzOYGvBppMqBR8q4qH6iN7FIoKWyVFado4Mm D43jvH5p7heVd9iCDkzeBAWG/sTkJ8mOrNfA0GE7+kxVudS8zDv9zHyD/tlWiWwY8UBN v6kA== X-Gm-Message-State: AOAM532rpU+BeWYibVNvu7GNdcBGu/ex2SgyeKQqQYE5OP8D9+ViVUnD zRs9DdkmImNoH7yM9icngTt1Iw== X-Google-Smtp-Source: ABdhPJyhbJiYDRgkeBOzGSDYl/Q4bW899WPbKkwOc5+O52YxDr+Jldi+D/l6eTKH3U562P3eoWFc0Q== X-Received: by 2002:a17:902:d101:b0:149:9004:4e7b with SMTP id w1-20020a170902d10100b0014990044e7bmr29405858plw.142.1641277341242; Mon, 03 Jan 2022 22:22:21 -0800 (PST) Received: from localhost ([2620:15c:202:201:6f47:183c:871a:2a1a]) by smtp.gmail.com with UTF8SMTPSA id d13sm35075562pfl.18.2022.01.03.22.22.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Jan 2022 22:22:21 -0800 (PST) From: Gwendal Grignou To: bleung@chromium.org, groeck@chromium.org Cc: linux-kernel@vger.kernel.org, Gwendal Grignou Subject: [PATCH 3/3] plaform/chrome: Remove SET_LATE_SYSTEM_SLEEP_PM_OPS Date: Mon, 3 Jan 2022 22:22:13 -0800 Message-Id: <20220104062213.2365356-4-gwendal@chromium.org> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog In-Reply-To: <20220104062213.2365356-1-gwendal@chromium.org> References: <20220104062213.2365356-1-gwendal@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" commit 296282fca791 ("PM: core: Add new *_PM_OPS macros, deprecate old ones= ") introduces LATE_SYSTEM_SLEEP_PM_OPS, so we can remove the #ifdef around suspend/resume functions. Signed-off-by: Gwendal Grignou --- drivers/platform/chrome/cros_ec_i2c.c | 6 ++---- drivers/platform/chrome/cros_ec_lpc.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_i2c.c b/drivers/platform/chrom= e/cros_ec_i2c.c index 30c8938c27d54e..b27c15f6774cc9 100644 --- a/drivers/platform/chrome/cros_ec_i2c.c +++ b/drivers/platform/chrome/cros_ec_i2c.c @@ -316,7 +316,6 @@ static int cros_ec_i2c_remove(struct i2c_client *client) return cros_ec_unregister(ec_dev); } =20 -#ifdef CONFIG_PM_SLEEP static int cros_ec_i2c_suspend(struct device *dev) { struct cros_ec_device *ec_dev =3D to_ec_dev(dev); @@ -330,10 +329,9 @@ static int cros_ec_i2c_resume(struct device *dev) =20 return cros_ec_resume(ec_dev); } -#endif =20 static const struct dev_pm_ops cros_ec_i2c_pm_ops =3D { - SET_LATE_SYSTEM_SLEEP_PM_OPS(cros_ec_i2c_suspend, cros_ec_i2c_resume) + LATE_SYSTEM_SLEEP_PM_OPS(cros_ec_i2c_suspend, cros_ec_i2c_resume) }; =20 #ifdef CONFIG_OF @@ -363,7 +361,7 @@ static struct i2c_driver cros_ec_driver =3D { .name =3D "cros-ec-i2c", .acpi_match_table =3D ACPI_PTR(cros_ec_i2c_acpi_id), .of_match_table =3D of_match_ptr(cros_ec_i2c_of_match), - .pm =3D &cros_ec_i2c_pm_ops, + .pm =3D pm_sleep_ptr(&cros_ec_i2c_pm_ops), }, .probe =3D cros_ec_i2c_probe, .remove =3D cros_ec_i2c_remove, diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrom= e/cros_ec_lpc.c index d6306d2a096f13..91b4f9dad069b1 100644 --- a/drivers/platform/chrome/cros_ec_lpc.c +++ b/drivers/platform/chrome/cros_ec_lpc.c @@ -504,7 +504,6 @@ static const struct dmi_system_id cros_ec_lpc_dmi_table= [] __initconst =3D { }; MODULE_DEVICE_TABLE(dmi, cros_ec_lpc_dmi_table); =20 -#ifdef CONFIG_PM_SLEEP static int cros_ec_lpc_suspend(struct device *dev) { struct cros_ec_device *ec_dev =3D dev_get_drvdata(dev); @@ -518,17 +517,16 @@ static int cros_ec_lpc_resume(struct device *dev) =20 return cros_ec_resume(ec_dev); } -#endif =20 static const struct dev_pm_ops cros_ec_lpc_pm_ops =3D { - SET_LATE_SYSTEM_SLEEP_PM_OPS(cros_ec_lpc_suspend, cros_ec_lpc_resume) + LATE_SYSTEM_SLEEP_PM_OPS(cros_ec_lpc_suspend, cros_ec_lpc_resume) }; =20 static struct platform_driver cros_ec_lpc_driver =3D { .driver =3D { .name =3D DRV_NAME, .acpi_match_table =3D cros_ec_lpc_acpi_device_ids, - .pm =3D &cros_ec_lpc_pm_ops, + .pm =3D pm_sleep_ptr(&cros_ec_lpc_pm_ops), }, .probe =3D cros_ec_lpc_probe, .remove =3D cros_ec_lpc_remove, --=20 2.34.1.448.ga2b2bfdf31-goog