Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1322551

[PATCH 4/5] HSI: nokia-modem: drop support for disabled pm

Show all headers | View raw

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 <sre@kernel.org>
---
 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] nokia-modem: kernel based PM Sebastian Reichel <sre@kernel.org> - 2016-01-31 02:30 +0100
  [PATCH 4/5] HSI: nokia-modem: drop support for disabled pm Sebastian Reichel <sre@kernel.org> - 2016-01-31 02:30 +0100
    Re: [PATCH 4/5] HSI: nokia-modem: drop support for disabled pm Pali Rohár <pali.rohar@gmail.com> - 2016-01-31 12:30 +0100
      Re: [PATCH 4/5] HSI: nokia-modem: drop support for disabled pm Sebastian Reichel <sre@kernel.org> - 2016-01-31 17:20 +0100
        Re: [PATCH 4/5] HSI: nokia-modem: drop support for disabled pm Pali Rohár <pali.rohar@gmail.com> - 2016-02-08 10:00 +0100
  [PATCH 2/5] HSI: nokia-modem: kernel based PM Sebastian Reichel <sre@kernel.org> - 2016-01-31 02:30 +0100
    Re: [PATCH 2/5] HSI: nokia-modem: kernel based PM Pavel Machek <pavel@ucw.cz> - 2016-01-31 18:40 +0100
      Re: [PATCH 2/5] HSI: nokia-modem: kernel based PM Sebastian Reichel <sre@kernel.org> - 2016-01-31 19:10 +0100
        Re: [PATCH 2/5] HSI: nokia-modem: kernel based PM Pavel Machek <pavel@ucw.cz> - 2016-02-07 22:40 +0100

csiph-web