From mboxrd@z Thu Jan 1 00:00:00 1970 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 3FDF9CCA479 for ; Mon, 18 Jul 2022 12:23:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233850AbiGRMXq (ORCPT ); Mon, 18 Jul 2022 08:23:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232158AbiGRMXd (ORCPT ); Mon, 18 Jul 2022 08:23:33 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4E10255AC for ; Mon, 18 Jul 2022 05:23:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658147012; x=1689683012; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PCncS+5bhS2HwKwR46Bn5LzAG4feJW5OQVXAlOnGCPk=; b=Cq6qxW1EnmZa+HAi4H0u0O+7pnovIIhlDgsjNJ+FPN98gC5GoHhfO+oj C+yyKTOg5WYKvd3deCSb1UMGrSGqDUS2O/7XBpRA3IIGjEeSn7Ro5A1Ob JwiusO451X1kfYVfkj1O0gT5+0yl2lE6aKoUlHMsuDSxZ79VQrLaldcwE VtfFvH8dANM/4Dbx1e51NlTVtW8XlUQHvSki8qQHrfj8RvMt0CICKtb4C pWyR/qfS3hgQ/l9gCjM2gQAtx16aQtFXprFzInWAn5nZkUxU5hF7Da6yQ GvEH5s03FPaVZmqZEysZdOilyT9b0ae58uxH2pYp3As6cJcsmlZ9TMWeO w==; X-IronPort-AV: E=McAfee;i="6400,9594,10411"; a="273035532" X-IronPort-AV: E=Sophos;i="5.92,281,1650956400"; d="scan'208";a="273035532" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2022 05:23:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,281,1650956400"; d="scan'208";a="924322696" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 18 Jul 2022 05:23:30 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 544B4199; Mon, 18 Jul 2022 15:23:39 +0300 (EEST) From: Andy Shevchenko To: Lee Jones , Andy Shevchenko , linux-kernel@vger.kernel.org Cc: Andy Shevchenko , Hans de Goede Subject: [RESEND][PATCH v1 3/9] mfd: intel_soc_pmic_crc: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() etc Date: Mon, 18 Jul 2022 15:23:22 +0300 Message-Id: <20220718122328.8287-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220718122328.8287-1-andriy.shevchenko@linux.intel.com> References: <20220718122328.8287-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Letting the compiler remove these functions when the kernel is built without CONFIG_PM_SLEEP support is simpler and less error prone than the use of #ifdef based kernel configuration guards. Signed-off-by: Andy Shevchenko Tested-by: Hans de Goede Acked-for-MFD-by: Lee Jones --- drivers/mfd/intel_soc_pmic_crc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/intel_soc_pmic_crc.c b/drivers/mfd/intel_soc_pmic_crc.c index 165f686132f6..c034e226a0bb 100644 --- a/drivers/mfd/intel_soc_pmic_crc.c +++ b/drivers/mfd/intel_soc_pmic_crc.c @@ -229,7 +229,6 @@ static void intel_soc_pmic_shutdown(struct i2c_client *i2c) return; } -#if defined(CONFIG_PM_SLEEP) static int intel_soc_pmic_suspend(struct device *dev) { struct intel_soc_pmic *pmic = dev_get_drvdata(dev); @@ -247,10 +246,8 @@ static int intel_soc_pmic_resume(struct device *dev) return 0; } -#endif -static SIMPLE_DEV_PM_OPS(intel_soc_pmic_pm_ops, intel_soc_pmic_suspend, - intel_soc_pmic_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(crystal_cove_pm_ops, intel_soc_pmic_suspend, intel_soc_pmic_resume); static const struct i2c_device_id intel_soc_pmic_i2c_id[] = { { } @@ -268,7 +265,7 @@ MODULE_DEVICE_TABLE(acpi, intel_soc_pmic_acpi_match); static struct i2c_driver intel_soc_pmic_i2c_driver = { .driver = { .name = "intel_soc_pmic_i2c", - .pm = &intel_soc_pmic_pm_ops, + .pm = pm_sleep_ptr(&crystal_cove_pm_ops), .acpi_match_table = ACPI_PTR(intel_soc_pmic_acpi_match), }, .probe = intel_soc_pmic_i2c_probe, -- 2.35.1