From patchwork Wed Aug 28 01:13:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Capella X-Patchwork-Id: 2850469 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 A057A9F485 for ; Wed, 28 Aug 2013 01:14:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C9AF020412 for ; Wed, 28 Aug 2013 01:14:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4967203E9 for ; Wed, 28 Aug 2013 01:14:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752817Ab3H1BOS (ORCPT ); Tue, 27 Aug 2013 21:14:18 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:51960 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752802Ab3H1BOQ (ORCPT ); Tue, 27 Aug 2013 21:14:16 -0400 Received: by mail-pa0-f53.google.com with SMTP id lb1so5519607pab.40 for ; Tue, 27 Aug 2013 18:14:15 -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=n9dHe8f1nman1TsKWzDhzbQie/j0xU6+XXctMHo1P+Q=; b=fVElatMeco8wpAfQl8N5TtnqiSd4UQIBla6zjgzFfeg2SGv+q7SKVXC8G5Mk7LXBaF t2EOj3fba+lYljnBOyiKVLiWHvu2aGDihOYn3jvo6ctaejro+rjdlIC56dsStrGNvhZh IpmaL6VTuEG8EeFDqaBoEkemar5puyUKietiYcZHp7QXTyTHaU2JSBUMXM8+ePsrS4YC PNGVL0zTEkpw1NUObFagJdHt5doeoBWPJqmoh4JMkSB93eilboXAjr2XOrAwcp/mH0xN zSkEEz9e4NQ2K3/eB0JSiSCLnAQ+xbxgxBuXVh0l3Lfi8CbhZOOCecVM8YI6gZKLXB6y 7HyQ== X-Gm-Message-State: ALoCoQlKrdCMaAJ9s5sM5OSCrhZAHYjgFnzVC/c3XQb8k/mclgXYiIEs4gf9m2U9NOQzyZho5RFa X-Received: by 10.68.226.3 with SMTP id ro3mr440849pbc.72.1377652455772; Tue, 27 Aug 2013 18:14:15 -0700 (PDT) Received: from localhost (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPSA id fk4sm29912622pab.23.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 27 Aug 2013 18:14:14 -0700 (PDT) From: Sebastian Capella To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@lists.infradead.org, linux-pm@vger.kernel.org, linaro-dev@lists.linaro.org Cc: Sebastian Capella , Len Brown , Pavel Machek , "Rafael J. Wysocki" Subject: [PATCH v2 RFT 1/2] PM / Hibernate: use name_to_dev_t to parse resume Date: Tue, 27 Aug 2013 18:13:56 -0700 Message-Id: <1377652437-2379-2-git-send-email-sebastian.capella@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1377652437-2379-1-git-send-email-sebastian.capella@linaro.org> References: <1377652437-2379-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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Cc: Len Brown Cc: Pavel Machek Cc: "Rafael J. Wysocki" --- kernel/power/hibernate.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index b26f5f1..8ba8719 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -971,15 +971,23 @@ 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); + + if (devcpy == NULL) + return -ENOMEM; + + 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();