From patchwork Thu Jul 27 17:16:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 127093 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp1270909vqo; Thu, 27 Jul 2023 11:01:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlEF6YFKt7P7EFG9zZZuO1phmOzk1BBYT8cQC+ZJWxlPSYHZUL+wIDayJMtc/Cr5y1oY9Nc9 X-Received: by 2002:a05:6402:6c1:b0:522:2bc8:cbb8 with SMTP id n1-20020a05640206c100b005222bc8cbb8mr2264261edy.6.1690480882002; Thu, 27 Jul 2023 11:01:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690480881; cv=none; d=google.com; s=arc-20160816; b=KaEu5DGy+GUqZPJUjq6CBycZUnbtj7pZqMWSX3kiVopWsGnCpn6I0fYgQZsOg6bY0+ ng+2yarg6Oc+8+Uy5iFzJ+reDhDFSksjBEVoqEs+c58A+Ju9cIhJj2yuexXMI6rBMKp+ L6ehQdnvW2YFHy21irRcY6eF1wXvWBPm2cK2hXXRf2cMf/pscVFUFu54vkSd3Sg2woty vZRKulyjQNsI4c7rwoWNacdSvEMyuC5/tDyLAl0e5YY2z0y/HAHEAUkywnDotjR82CKm 3AILc9LgDPq7o9Vt93ULzsENcZZl80ZA1YGBE8N/2gz0PrEzIDzmjeX8iSUnDFJR1Z/h 9C3A== 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=ZukR9CSekCYtKTsN6DxagPJbUeR97eyTc3MZVOC6Wus=; fh=Pks6uESMALkm+FM9kM/YKp1n4hyLQKFUl8+AB2zSeNY=; b=g3hqwkcqk004TGI+fxx6IqQuofwrV+cdaYFDMwC8H4Ba6UXA3XJ+gFrTX3dJAAKMFv W4uHnILQ22SLXOZlJIlcWn6d3uYlDkHAvEJEPKSxbH8JnCooxF46ONyPEo32EaTtR3P5 VvktubLecv0i5JB2Z9vuTUrkYps2tlOKgDclJ1k0LoDcbFO8jvUnn6lRLbzQMmZgxNyW qaxhjlTkAELl1XYvVlmt4k3vPE+uWZ7hwH/CPOQ+NafXzFcOc/ATGR/s5JO2Txev4jPF bzVhqe4AsQkpZ4Xk59wvwrqQCoYnn5/hdEUIxsPuyje2vHmE1o3xxdErgdPC+llnawwp 8i5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=LehozSB0; 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 q9-20020aa7d449000000b0052185566aa9si1228797edr.565.2023.07.27.11.00.56; Thu, 27 Jul 2023 11:01:21 -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=LehozSB0; 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 S233025AbjG0RTL (ORCPT + 99 others); Thu, 27 Jul 2023 13:19:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232809AbjG0RS7 (ORCPT ); Thu, 27 Jul 2023 13:18:59 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF1963590 for ; Thu, 27 Jul 2023 10:18:42 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-686e0213c0bso933027b3a.1 for ; Thu, 27 Jul 2023 10:18:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1690478322; x=1691083122; 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=ZukR9CSekCYtKTsN6DxagPJbUeR97eyTc3MZVOC6Wus=; b=LehozSB0PkZqslyfeU+81VdLb4xGnBIE9Q91g2SB5mCOztpPoV+jzWyeJ3K7cQ3TXL 2NeRYQzg+J1oJlSjDSDkbLzzQnsFrlOGlm3rILR8Ze2X14LBOa3eZxq0zu4F64wbkVFX yH2Xb4Cezq3WnmRWxZ9n0P2ESlXBy8TiW2D0w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690478322; x=1691083122; 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=ZukR9CSekCYtKTsN6DxagPJbUeR97eyTc3MZVOC6Wus=; b=BT8DU/pzWuRH+4AujahBJOwnhOrGYS4Gi8KxycbC5fryzvNSjD397zJBOxoKf+AUES +eTQX5syYW+FaFW063iKJqLMgzxjogkse173xfFloMN0LbuPSanU5DGGn2h3izHvmwCV cnFp7WDwqN4v9xpfDjWpVlaJ91WvwDMwd3L3uo61BHnqpVn+HEgahuwok99Ehg85q0k9 EuRbxViJT9cWH9/oEVRzFL/G+0YpdCz64DDIY8vBAw5CBdKZXKSz/pzgLrnX9uwTSP+d 9dwM9riQbcI2NZqfP8sY5669cwhzodUxKMCeGlgDFAW9FL4UABlaGvTzdRR2fRAst97H V80A== X-Gm-Message-State: ABy/qLao8sMOECzU0+9tBUR4xqxaLu6Rbf21FhNnJJ3uu53u1dK+2/Do jnmSigIhJ8g/qfE+We/lqNmUew== X-Received: by 2002:a05:6a20:1442:b0:134:6aff:ee6c with SMTP id a2-20020a056a20144200b001346affee6cmr6130826pzi.41.1690478322382; Thu, 27 Jul 2023 10:18:42 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:9d:2:2339:954b:b98f:611a]) by smtp.gmail.com with ESMTPSA id 17-20020aa79111000000b0064f76992905sm1702524pfh.202.2023.07.27.10.18.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 10:18:41 -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: linux-arm-msm@vger.kernel.org, yangcong5@huaqin.corp-partner.google.com, devicetree@vger.kernel.org, Daniel Vetter , hsinyi@google.com, Chris Morgan , linux-input@vger.kernel.org, cros-qcom-dts-watchers@chromium.org, Dmitry Torokhov , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Douglas Anderson Subject: [PATCH v4 05/11] HID: i2c-hid: Switch to SYSTEM_SLEEP_PM_OPS() Date: Thu, 27 Jul 2023 10:16:32 -0700 Message-ID: <20230727101636.v4.5.Ib2a2865bd3c0b068432259dfc7d76cebcbb512be@changeid> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog In-Reply-To: <20230727171750.633410-1-dianders@chromium.org> References: <20230727171750.633410-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 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772597681462527791 X-GMAIL-MSGID: 1772597681462527791 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. Reviewed-by: Maxime Ripard 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);