From: Sebastian Capella <sebastian.capella@linaro.org> To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, patches@linaro.org Cc: Sebastian Capella <sebastian.capella@linaro.org>, Len Brown <len.brown@intel.com>, "Rafael J. Wysocki" <rjw@sisk.pl> Subject: [PATCH v3 2/2] PM / Hibernate: use name_to_dev_t to parse resume Date: Thu, 3 Oct 2013 14:10:38 -0700 [thread overview] Message-ID: <1380834638-24035-3-git-send-email-sebastian.capella@linaro.org> (raw) In-Reply-To: <1380834638-24035-1-git-send-email-sebastian.capella@linaro.org> 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@linaro.org> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: Len Brown <len.brown@intel.com> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> --- kernel/power/hibernate.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index c9c759d..a29d2a7 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -972,16 +972,11 @@ 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; - if (sscanf(buf, "%u:%u", &maj, &min) != 2) - goto out; - - res = MKDEV(maj,min); - if (maj != MAJOR(res) || min != MINOR(res)) - goto out; + res = name_to_dev_t(buf); + if (res == 0) + return -EINVAL; lock_system_sleep(); swsusp_resume_device = res; @@ -989,9 +984,7 @@ static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute *attr, printk(KERN_INFO "PM: Starting manual resume from disk\n"); noresume = 0; software_resume(); - ret = n; - out: - return ret; + return n; } power_attr(resume); -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: sebastian.capella@linaro.org (Sebastian Capella) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/2] PM / Hibernate: use name_to_dev_t to parse resume Date: Thu, 3 Oct 2013 14:10:38 -0700 [thread overview] Message-ID: <1380834638-24035-3-git-send-email-sebastian.capella@linaro.org> (raw) In-Reply-To: <1380834638-24035-1-git-send-email-sebastian.capella@linaro.org> 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@linaro.org> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: Len Brown <len.brown@intel.com> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> --- kernel/power/hibernate.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index c9c759d..a29d2a7 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -972,16 +972,11 @@ 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; - if (sscanf(buf, "%u:%u", &maj, &min) != 2) - goto out; - - res = MKDEV(maj,min); - if (maj != MAJOR(res) || min != MINOR(res)) - goto out; + res = name_to_dev_t(buf); + if (res == 0) + return -EINVAL; lock_system_sleep(); swsusp_resume_device = res; @@ -989,9 +984,7 @@ static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute *attr, printk(KERN_INFO "PM: Starting manual resume from disk\n"); noresume = 0; software_resume(); - ret = n; - out: - return ret; + return n; } power_attr(resume); -- 1.7.9.5
next prev parent reply other threads:[~2013-10-03 21:11 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-10-03 21:10 [PATCH v3 0/2] PM / Hibernate: sysfs resume Sebastian Capella 2013-10-03 21:10 ` Sebastian Capella 2013-10-03 21:10 ` [PATCH v3 1/2] init/do_mounts.c: ignore final \n in name_to_dev_t Sebastian Capella 2013-10-03 21:10 ` Sebastian Capella 2013-10-03 21:15 ` Andrew Morton 2013-10-03 21:15 ` Andrew Morton 2013-10-03 21:42 ` Sebastian Capella 2013-10-03 21:42 ` Sebastian Capella 2013-10-03 23:47 ` Sebastian Capella 2013-10-03 23:47 ` Sebastian Capella 2013-10-10 17:50 ` Sebastian Capella 2013-10-10 17:50 ` Sebastian Capella 2013-10-10 22:47 ` Eric W. Biederman 2013-10-10 22:47 ` Eric W. Biederman 2013-10-10 23:39 ` Sebastian Capella 2013-10-10 23:39 ` Sebastian Capella 2013-10-22 17:54 ` Sebastian Capella 2013-10-22 17:54 ` Sebastian Capella 2014-01-28 18:59 ` Sebastian Capella 2014-01-28 18:59 ` Sebastian Capella 2014-01-28 20:54 ` Andrew Morton 2014-01-28 20:54 ` Andrew Morton 2014-01-28 20:58 ` Sebastian Capella 2014-01-28 20:58 ` Sebastian Capella 2014-01-29 18:29 ` Sebastian Capella 2014-01-29 18:29 ` Sebastian Capella 2014-01-29 18:41 ` Andrew Morton 2014-01-29 18:41 ` Andrew Morton 2013-10-03 21:10 ` Sebastian Capella [this message] 2013-10-03 21:10 ` [PATCH v3 2/2] PM / Hibernate: use name_to_dev_t to parse resume Sebastian Capella
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1380834638-24035-3-git-send-email-sebastian.capella@linaro.org \ --to=sebastian.capella@linaro.org \ --cc=len.brown@intel.com \ --cc=linaro-kernel@lists.linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=patches@linaro.org \ --cc=rjw@sisk.pl \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.