From patchwork Thu Dec 14 14:02:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 121957 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp6843933qgn; Thu, 14 Dec 2017 06:03:15 -0800 (PST) X-Google-Smtp-Source: ACJfBosxrhi5iRuj13uxh9jcf0V/uutZtWxFLT8vmt3KTaRHXCkDqEdRC0LTyk1Qo5dcDk9Hdjj3 X-Received: by 10.84.252.143 with SMTP id y15mr9844356pll.138.1513260195514; Thu, 14 Dec 2017 06:03:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513260195; cv=none; d=google.com; s=arc-20160816; b=zE/WZw0lnKijWjZt6XybyWvlcfT7B5LiRGtTwNfZPQluvKa/OpBzwb7zR/NjroEuaS UTzJNDTIbWDIg+XRE5trq5dahqHvCZeX71lktMeNYuHFbO6RUlEuyLVU/IXbm5SvVCz7 goEqF6tJch7VnKgoYKVGTWdND1zdmao3yFVcak4pp2ZhxGIslpOgfPBLTGJN2Zq7KuCS H30XshM4k2vj3Bzc6yPX0veMZVmISiiZ+pml49YOaSpgjo0DkngizNUuLYgL3h05rsi4 7T0e0eKkA5De0mW2ITKuKslYrzUQyh6v+KT2Eqbcrdb5BKaKLz5pTbG56ogy05S4u5AE 4ChQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=yHNPnfJIH6nfXAeT2ybow+unLJ75NGYvYnf0NCV55is=; b=g6S2Je0mJEeiarU3yeCGSZH8k8E/2L+d3ZSG1PAL3qakDGmk23Nu8gTXS/C1zknEqV m8fjWS7rzj+qGKpSYrARCJ7VD1HaqiLjDQ0tcxHjUs+AGBCVNOdqP8gOl27lwGQNjdiN ojYC1ZSH/WNN0N0dGGYwI+tJBlG3NnQv7fBD26Ddib6KLpHIapy47qVuvz1SCG3XU5sq 4dZndlo3GiZr7B0mHGzStPqRNghrzzYzT8AyIVud9JJxT0PFL/jtZzrK+Q2VHBPnXcxP MDECLbf2E04NxJsxAjF9XZ/cMJkzb7eQBdznenkmU9G6H+6IBohZG07GhvSwdsz4dmmY ckkg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v4si3183358plb.791.2017.12.14.06.03.15; Thu, 14 Dec 2017 06:03:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752653AbdLNODM (ORCPT + 20 others); Thu, 14 Dec 2017 09:03:12 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:42158 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751042AbdLNODJ (ORCPT ); Thu, 14 Dec 2017 09:03:09 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 33CB61435; Thu, 14 Dec 2017 06:03:09 -0800 (PST) Received: from sugar.kfn.arm.com (unknown [10.45.48.196]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 72C863F246; Thu, 14 Dec 2017 06:03:07 -0800 (PST) From: Gilad Ben-Yossef To: Greg Kroah-Hartman Cc: Ofir Drang , linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org Subject: [PATCH 02/10] staging: ccree: clean up PM registration Date: Thu, 14 Dec 2017 14:02:39 +0000 Message-Id: <1513260170-26346-3-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513260170-26346-1-git-send-email-gilad@benyossef.com> References: <1513260170-26346-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Clean up power management registration. Signed-off-by: Gilad Ben-Yossef --- drivers/staging/ccree/ssi_driver.c | 16 +++------------- drivers/staging/ccree/ssi_pm.c | 4 ++++ drivers/staging/ccree/ssi_pm.h | 3 +++ 3 files changed, 10 insertions(+), 13 deletions(-) -- 2.7.4 diff --git a/drivers/staging/ccree/ssi_driver.c b/drivers/staging/ccree/ssi_driver.c index fbf0338..ad02d92 100644 --- a/drivers/staging/ccree/ssi_driver.c +++ b/drivers/staging/ccree/ssi_driver.c @@ -500,18 +500,6 @@ static int cc7x_remove(struct platform_device *plat_dev) return 0; } -#if defined(CONFIG_PM) -static const struct dev_pm_ops arm_cc7x_driver_pm = { - SET_RUNTIME_PM_OPS(cc_pm_suspend, cc_pm_resume, NULL) -}; -#endif - -#if defined(CONFIG_PM) -#define CC_DRIVER_RUNTIME_PM (&arm_cc7x_driver_pm) -#else -#define CC_DRIVER_RUNTIME_PM NULL -#endif - static const struct of_device_id arm_cc7x_dev_of_match[] = { {.compatible = "arm,cryptocell-712-ree"}, {} @@ -522,7 +510,9 @@ static struct platform_driver cc7x_driver = { .driver = { .name = "cc7xree", .of_match_table = arm_cc7x_dev_of_match, - .pm = CC_DRIVER_RUNTIME_PM, +#ifdef CONFIG_PM + .pm = &ccree_pm, +#endif }, .probe = cc7x_probe, .remove = cc7x_remove, diff --git a/drivers/staging/ccree/ssi_pm.c b/drivers/staging/ccree/ssi_pm.c index 3c4892b..0db935d 100644 --- a/drivers/staging/ccree/ssi_pm.c +++ b/drivers/staging/ccree/ssi_pm.c @@ -34,6 +34,10 @@ #define POWER_DOWN_ENABLE 0x01 #define POWER_DOWN_DISABLE 0x00 +const struct dev_pm_ops ccree_pm = { + SET_RUNTIME_PM_OPS(cc_pm_suspend, cc_pm_resume, NULL) +}; + int cc_pm_suspend(struct device *dev) { struct cc_drvdata *drvdata = dev_get_drvdata(dev); diff --git a/drivers/staging/ccree/ssi_pm.h b/drivers/staging/ccree/ssi_pm.h index a5f2b1b..91140a3 100644 --- a/drivers/staging/ccree/ssi_pm.h +++ b/drivers/staging/ccree/ssi_pm.h @@ -30,6 +30,9 @@ int cc_pm_init(struct cc_drvdata *drvdata); void cc_pm_fini(struct cc_drvdata *drvdata); #if defined(CONFIG_PM) + +extern const struct dev_pm_ops ccree_pm; + int cc_pm_suspend(struct device *dev); int cc_pm_resume(struct device *dev);