From patchwork Wed Aug 21 19:46:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Capella X-Patchwork-Id: 2847885 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9AA919F271 for ; Wed, 21 Aug 2013 19:47:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 026FC204EB for ; Wed, 21 Aug 2013 19:47:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25E11204B4 for ; Wed, 21 Aug 2013 19:47:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752688Ab3HUTrW (ORCPT ); Wed, 21 Aug 2013 15:47:22 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:47711 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752685Ab3HUTrV (ORCPT ); Wed, 21 Aug 2013 15:47:21 -0400 Received: by mail-pb0-f44.google.com with SMTP id xa7so814658pbc.17 for ; Wed, 21 Aug 2013 12:47:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wH7NQRtCx5U6lVAA7BusZhYaDbdKEQwGitZ65YQu+nM=; b=SmwrksRmEROXZ/gxMciO3moBdzTgT7rQMeR2LfLlu2Bp9y2c26Ukcjy15Ta5EJhSaG X4Ukht9jF1zzxeTAXDIjawfU4gZxupUm1Slm5HXBlxGeWQIB6dpGxZ6tnhoh6mnslPAA 1lXIG+UMT9WSNdDxO8g8/VInsDMiID8qoHbTZx7dS33rCW+B608tGgx/GB6svzswA/EQ rYFB0to14RU5cfcaOdMwONc6KYldi8KpHL5XdWycenNWTgDD1T/J8mVOg0M/z/s+mUF7 uDvGWQUl6AJm4XMmMgMlady152TtjHQjOnQCjxINvwXfoG1QhiPOWRkCciixuc9QmaUg 43DA== X-Gm-Message-State: ALoCoQlVHaN9ztlDNoqBUFDmYhhoYeMOH0WVoL8lGNOePu3ObIMM7FEbOXH4c0GwSS5QaprdmsYD X-Received: by 10.66.189.98 with SMTP id gh2mr11287726pac.60.1377114441069; Wed, 21 Aug 2013 12:47:21 -0700 (PDT) Received: from localhost (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPSA id nv6sm10102502pbc.6.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 21 Aug 2013 12:47:20 -0700 (PDT) From: Sebastian Capella To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, linaro-dev@lists.linaro.org Cc: len.brown@intel.com, pavel@ucw.cz, rjw@sisk.pl, Sebastian Capella Subject: [PATCH RFC 1/2] PM / Hibernate: use name_to_dev_t to parse resume Date: Wed, 21 Aug 2013 12:46:52 -0700 Message-Id: <1377114413-8521-2-git-send-email-sebastian.capella@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1377114413-8521-1-git-send-email-sebastian.capella@linaro.org> References: <1377114413-8521-1-git-send-email-sebastian.capella@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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();