[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1377114413-8521-2-git-send-email-sebastian.capella@linaro.org>
Date: Wed, 21 Aug 2013 12:46:52 -0700
From: Sebastian Capella <sebastian.capella@...aro.org>
To: linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-pm@...r.kernel.org, linaro-dev@...ts.linaro.org
Cc: len.brown@...el.com, pavel@....cz, rjw@...k.pl,
Sebastian Capella <sebastian.capella@...aro.org>
Subject: [PATCH RFC 1/2] PM / Hibernate: use name_to_dev_t to parse resume
Use the name_to_dev_t call to parse the device name echo'd to
to /sys/power/resume. This imitates the method used in hibernate.c
in software_resume, and allows the resume partition to be specified
using other equivalent device formats as well. By allowing
/sys/debug/resume to accept the same syntax as the resume=device
parameter, we can parse the resume=device in the init script and
use the resume device directly from the kernel command line.
Signed-off-by: Sebastian Capella <sebastian.capella@...aro.org>
---
kernel/power/hibernate.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index b26f5f1..51d4c29 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -971,15 +971,19 @@ static ssize_t resume_show(struct kobject *kobj, struct kobj_attribute *attr,
static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute *attr,
const char *buf, size_t n)
{
- unsigned int maj, min;
dev_t res;
int ret = -EINVAL;
+ int len = n;
+ char *devcpy;
- if (sscanf(buf, "%u:%u", &maj, &min) != 2)
- goto out;
+ if (buf[len-1] == '\n')
+ len--;
+
+ devcpy = kstrndup(buf, len, GFP_KERNEL);
+ res = name_to_dev_t(devcpy);
+ kfree(devcpy);
- res = MKDEV(maj,min);
- if (maj != MAJOR(res) || min != MINOR(res))
+ if (res == 0)
goto out;
lock_system_sleep();
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists