From patchwork Wed Jun 7 21:49:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 104736 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp504042vqr; Wed, 7 Jun 2023 14:54:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4JKuqbdblHqPxs/1e/voI9V9Ihj5eVdoOEhEEpZMH7vv29UDK4sDbTxRF5oT7iGnCt0rLM X-Received: by 2002:a05:6a21:980d:b0:111:1bc4:cf0a with SMTP id ue13-20020a056a21980d00b001111bc4cf0amr2586325pzb.52.1686174884643; Wed, 07 Jun 2023 14:54:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686174884; cv=none; d=google.com; s=arc-20160816; b=yuYJd6hYAPxs7MsKUc+WwTTVpQaxaBD3VMrFDJMIlx9n4wobimSjrq3ZT1B5Ht5Uib 7sv9ilwM/gh4gUwoAdnFk3ViSJ7ZqCjd6/j5shHMWevfjCJQ3QruZOezIkabr9MOeQxC ptSihEAJe5yDgcjdkI1yJ3ym+xmldV8KBbOqRiaghriORNW7H35jIJMe7Q0DultUxF62 9LPVkOVkwTIAT6/ov0HyVO0ytPx5Q5WIJ3xK5ZN3HK4yntAJMPKYjaT7FnjDo1eW6dba QbCn7uo8KpDqVQCvv1tT33AbH1qjN89ukGHzRbYUfs/xIabYb3NSyFmjP22dLdqD8d1N UZsg== 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=C0TJ0M8h8FSBEytElW2U8aVLESeLFlDMicg+igIg24E=; b=uJKLL5fvhQx67nFQ5HrQ70UgGKMIj3lb9ep2RoQVbOnS/FaEiLu7VSfO8PrCwtsZ47 GW563W/ezxOOyFf0/K44TIzjB5TY3MlMyNGlcD0xZcb/QVA6UUt/7KFgzUESBz674Lyl 58qFY3uRB2AJ3ubBxA9ZWVOgzk/YtzXb/zju8BVUHbIQH1Yz/DsOoo+XD31m2WP17HE8 686djNuEXTDKt+C6FiXnRhZejnOfZ3jT+VD5KGFyduN1XA+1XwpHfEfnGoxwD7S+5+pM JiIgsvbyfsEJdcCIbDJPgkKy6Gl9RR8aIHwe6lqgcx4XHVeu7fz393U/pCfnsQ/FdGfO AURw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="ENQV/aC/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j21-20020a637a55000000b005344b36c64asi9628153pgn.786.2023.06.07.14.54.31; Wed, 07 Jun 2023 14:54:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="ENQV/aC/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230247AbjFGVxb (ORCPT + 99 others); Wed, 7 Jun 2023 17:53:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232139AbjFGVxV (ORCPT ); Wed, 7 Jun 2023 17:53:21 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B90B2129 for ; Wed, 7 Jun 2023 14:53:19 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-65242634690so4647688b3a.0 for ; Wed, 07 Jun 2023 14:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1686174798; x=1688766798; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C0TJ0M8h8FSBEytElW2U8aVLESeLFlDMicg+igIg24E=; b=ENQV/aC/8MxPO5Q9yi4JEgfC7IjnKPTFvema6S7aTysVupGrZimGTZvAuJcu78oBC4 O+bmUxGBIYUyrFdYZQQHNNtYwFkENO4CGZuSUlme+FgsHKK6Yw9s3il2gcK9OpDZ+vrp xmuXwfUYInD3fPMXGm2Dnhyqk3dOQ330vO0+0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686174798; x=1688766798; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C0TJ0M8h8FSBEytElW2U8aVLESeLFlDMicg+igIg24E=; b=Vi5Ri230Qp7Xlnae8ewo6KI30vAoIM8p8UTWekUYVaQ5h4SSDvQndp6snJdFSRRviL 1BYLuqpWqnH5qdisy28fxolWhGrlSR1TA9+caD8gQhbMiU8bCWR5/jGc+vMPPwvFb2z4 6IKTGtjBiu2r7kx1u8DCNuwDw3hxu5ZmN5BrPFyPB6Y4BtyatmcHHLVqCV18zXzU0aK/ oGIz729zSJuxb8Bt9x0zBmGLU/cI/mXahMuj2ywzwldhy5f5v8Jlev5C8TeA2c0U+76d ukaniKYJ6U6lM0qc9hvswkOQa2QRGzZYZQ+MjNm8UO9zhEf0BznowBdUWWhiDgMZaCd2 Mkpw== X-Gm-Message-State: AC+VfDyYA6FOb/tuoo/4Yfs2TsiS/2zVqT5kl66TJX0pepYwH5AMFPZh TepAQhixDbQ0WdJUTb5yAYrXGQ== X-Received: by 2002:a05:6a00:1820:b0:65d:a631:9f39 with SMTP id y32-20020a056a00182000b0065da6319f39mr6657335pfa.32.1686174798580; Wed, 07 Jun 2023 14:53:18 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:9d:2:34b2:b638:6b53:f6c2]) by smtp.gmail.com with ESMTPSA id j25-20020aa78d19000000b0065dd1e7c2c1sm1376486pfe.63.2023.06.07.14.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 14:53:18 -0700 (PDT) From: Douglas Anderson To: Jiri Kosina , Benjamin Tissoires , Bjorn Andersson , Konrad Dybcio , Rob Herring , Frank Rowand , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Sam Ravnborg , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann Cc: dri-devel@lists.freedesktop.org, Dmitry Torokhov , linux-input@vger.kernel.org, Daniel Vetter , linux-kernel@vger.kernel.org, hsinyi@google.com, cros-qcom-dts-watchers@chromium.org, devicetree@vger.kernel.org, yangcong5@huaqin.corp-partner.google.com, linux-arm-msm@vger.kernel.org, Chris Morgan , Douglas Anderson Subject: [PATCH v2 05/10] HID: i2c-hid: Switch to SYSTEM_SLEEP_PM_OPS() Date: Wed, 7 Jun 2023 14:49:27 -0700 Message-ID: <20230607144931.v2.5.Ib2a2865bd3c0b068432259dfc7d76cebcbb512be@changeid> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog In-Reply-To: <20230607215224.2067679-1-dianders@chromium.org> References: <20230607215224.2067679-1-dianders@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768082515837682769?= X-GMAIL-MSGID: =?utf-8?q?1768082515837682769?= The SYSTEM_SLEEP_PM_OPS() allows us to get rid of '#ifdef CONFIG_PM_SLEEP', as talked about in commit 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old ones"). This change is expected to have no functional effect. Signed-off-by: Douglas Anderson --- (no changes since v1) drivers/hid/i2c-hid/i2c-hid-core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c index efbba0465eef..19d985c20a5c 100644 --- a/drivers/hid/i2c-hid/i2c-hid-core.c +++ b/drivers/hid/i2c-hid/i2c-hid-core.c @@ -1085,7 +1085,6 @@ void i2c_hid_core_shutdown(struct i2c_client *client) } EXPORT_SYMBOL_GPL(i2c_hid_core_shutdown); -#ifdef CONFIG_PM_SLEEP static int i2c_hid_core_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); @@ -1138,10 +1137,9 @@ static int i2c_hid_core_resume(struct device *dev) return hid_driver_reset_resume(hid); } -#endif const struct dev_pm_ops i2c_hid_core_pm = { - SET_SYSTEM_SLEEP_PM_OPS(i2c_hid_core_suspend, i2c_hid_core_resume) + SYSTEM_SLEEP_PM_OPS(i2c_hid_core_suspend, i2c_hid_core_resume) }; EXPORT_SYMBOL_GPL(i2c_hid_core_pm);