From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933140AbcAaBUO (ORCPT ); Sat, 30 Jan 2016 20:20:14 -0500 Received: from ring0.de ([5.45.101.7]:43473 "EHLO ring0.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933026AbcAaBUJ (ORCPT ); Sat, 30 Jan 2016 20:20:09 -0500 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail * domains are different * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] From: Sebastian Reichel To: Sebastian Reichel , Tony Lindgren , =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Aaro Koskinen Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= , Pavel Machek , linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] HSI: nokia-modem: drop support for disabled pm Date: Sun, 31 Jan 2016 02:19:46 +0100 Message-Id: <1454203187-688-5-git-send-email-sre@kernel.org> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1454203187-688-1-git-send-email-sre@kernel.org> References: <1454203187-688-1-git-send-email-sre@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Disabled power management means, that the driver can only be used together with further out-of-tree kernel patches. There is no reason to support this in the mainline kernel and not having support for it means, that userspace can automatically detect if we are running kernel based power management. Signed-off-by: Sebastian Reichel --- drivers/hsi/clients/nokia-modem.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/hsi/clients/nokia-modem.c b/drivers/hsi/clients/nokia-modem.c index 1b4a250cf113..5e333eb82912 100644 --- a/drivers/hsi/clients/nokia-modem.c +++ b/drivers/hsi/clients/nokia-modem.c @@ -33,7 +33,7 @@ static unsigned int pm = 1; module_param(pm, int, 0400); MODULE_PARM_DESC(pm, - "Enable power management (0=disabled, 1=userland based [default], 2=kernel based)"); + "Enable power management (1=userland based [default], 2=kernel based)"); struct nokia_modem_device { struct tasklet_struct nokia_modem_rst_ind_tasklet; @@ -198,6 +198,11 @@ static int nokia_modem_gpio_probe(struct device *dev) struct nokia_modem_device *modem = dev_get_drvdata(dev); int gpio_count, gpio_name_count, i, err; + if (pm != 1 && pm != 2) { + dev_err(dev, "invalid pm configuration!"); + return -EINVAL; + } + gpio_count = of_gpio_count(np); if (gpio_count < 0) { -- 2.7.0.rc3