From patchwork Thu Mar 21 13:28:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajagopal Venkat X-Patchwork-Id: 2313391 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id BDCD1400E6 for ; Thu, 21 Mar 2013 13:29:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758063Ab3CUN3I (ORCPT ); Thu, 21 Mar 2013 09:29:08 -0400 Received: from mail-da0-f53.google.com ([209.85.210.53]:40832 "EHLO mail-da0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755777Ab3CUN3G (ORCPT ); Thu, 21 Mar 2013 09:29:06 -0400 Received: by mail-da0-f53.google.com with SMTP id n34so538424dal.12 for ; Thu, 21 Mar 2013 06:29:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=mvR0UYJFIOGKCB6f9goWD+mRrdngAqnkYfUPgdIlInE=; b=XEOp18xV+ODn3gafedUDm7YfYWhd34Z9gy34+8I7cgEEjag5EgiH09d95Ai1TwT4p+ O2d88qs92VFfWzGfphpCYAW89GcWTMS0Hddfbw9KkppFHt2HutCTpLdKZ5LYHe/sHZPt znZq3Y71bsJl082SgxFQFXVjjQO4p8p2cVVg1+YtwKvcJz7pNjzLhxwPNuvrX4EO1XaY iK6iUNyfXLQrXD8xPP2PiyqLOBveNimLxBjnkbnu93eu8Fjl9yNq5ABCJ0htE76aeuK/ OxCMkB2gwI+0CZp5R9bPjd6VGxqxTl9wOcJBOkAV6gTM47g0vbq+V7WLpY9s2RTYkj+G t49Q== X-Received: by 10.68.213.231 with SMTP id nv7mr15150356pbc.85.1363872545921; Thu, 21 Mar 2013 06:29:05 -0700 (PDT) Received: from localhost.localdomain ([115.241.125.186]) by mx.google.com with ESMTPS id gn2sm6129845pbb.22.2013.03.21.06.29.01 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 06:29:05 -0700 (PDT) From: Rajagopal Venkat To: myungjoo.ham@samsung.com, rjw@sisk.pl, Kevin Hilman Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Rajagopal Venkat Subject: [PATCH 1/2] PM / devfreq: Fix compiler warnings Date: Thu, 21 Mar 2013 18:58:25 +0530 Message-Id: <1363872506-3630-2-git-send-email-rajagopal.venkat@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363872506-3630-1-git-send-email-rajagopal.venkat@linaro.org> References: <1363872506-3630-1-git-send-email-rajagopal.venkat@linaro.org> X-Gm-Message-State: ALoCoQk+wQCF0qwsPu+57IcUrXKQ6oOcPLTsNJGKYG/TXwXQHs26PQkMi7ADsECYQ+TWseSIxfGg Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Fix compiler warnings generated when devfreq is not enabled (CONFIG_PM_DEVFREQ is not set). Signed-off-by: Rajagopal Venkat --- include/linux/devfreq.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index 04ad61d..5f1ab92 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h @@ -215,7 +215,7 @@ struct devfreq_simple_ondemand_data { #endif #else /* !CONFIG_PM_DEVFREQ */ -static struct devfreq *devfreq_add_device(struct device *dev, +static inline struct devfreq *devfreq_add_device(struct device *dev, struct devfreq_dev_profile *profile, const char *governor_name, void *data) @@ -223,34 +223,34 @@ static struct devfreq *devfreq_add_device(struct device *dev, return NULL; } -static int devfreq_remove_device(struct devfreq *devfreq) +static inline int devfreq_remove_device(struct devfreq *devfreq) { return 0; } -static int devfreq_suspend_device(struct devfreq *devfreq) +static inline int devfreq_suspend_device(struct devfreq *devfreq) { return 0; } -static int devfreq_resume_device(struct devfreq *devfreq) +static inline int devfreq_resume_device(struct devfreq *devfreq) { return 0; } -static struct opp *devfreq_recommended_opp(struct device *dev, +static inline struct opp *devfreq_recommended_opp(struct device *dev, unsigned long *freq, u32 flags) { - return -EINVAL; + return ERR_PTR(-EINVAL); } -static int devfreq_register_opp_notifier(struct device *dev, +static inline int devfreq_register_opp_notifier(struct device *dev, struct devfreq *devfreq) { return -EINVAL; } -static int devfreq_unregister_opp_notifier(struct device *dev, +static inline int devfreq_unregister_opp_notifier(struct device *dev, struct devfreq *devfreq) { return -EINVAL;