From patchwork Tue May 23 01:47:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: BaoJun Luo X-Patchwork-Id: 9741719 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6F45F60388 for ; Tue, 23 May 2017 01:48:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F9ED283F2 for ; Tue, 23 May 2017 01:48:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50D8128766; Tue, 23 May 2017 01:48:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=2.0 tests=BAYES_00, MSGID_MULTIPLE_AT, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E151283F2 for ; Tue, 23 May 2017 01:48:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752564AbdEWBsL convert rfc822-to-8bit (ORCPT ); Mon, 22 May 2017 21:48:11 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:47465 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752309AbdEWBsK (ORCPT ); Mon, 22 May 2017 21:48:10 -0400 Received: from epcas1p3.samsung.com (unknown [182.195.41.47]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20170523014808epoutp04caaecd15d1db4ae8ce36447c9062ae8d~BGQtz43ro2164021640epoutp04G; Tue, 23 May 2017 01:48:08 +0000 (GMT) Received: from epsmges1p4.samsung.com (unknown [182.195.42.56]) by epcas1p2.samsung.com (KnoxPortal) with ESMTP id 20170523014808epcas1p2995716e0ea327d2b5b3641ddd1313c46~BGQtmR5-J3215432154epcas1p2Z; Tue, 23 May 2017 01:48:08 +0000 (GMT) Received: from epcas1p1.samsung.com ( [182.195.41.45]) by epsmges1p4.samsung.com (Symantec Messaging Gateway) with SMTP id D7.A4.12779.7D493295; Tue, 23 May 2017 10:48:07 +0900 (KST) Received: from epsmgms2p1.samsung.com (unknown [182.195.42.79]) by epcas1p4.samsung.com (KnoxPortal) with ESMTP id 20170523014807epcas1p44d542b7f3bb7ed19f05a11b874231c55~BGQtU_BDh2531725317epcas1p4F; Tue, 23 May 2017 01:48:07 +0000 (GMT) X-AuditID: b6c32a38-f791a6d0000031eb-4d-592394d7ed2d Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p1.samsung.com (Symantec Messaging Gateway) with SMTP id B9.9B.02179.7D493295; Tue, 23 May 2017 10:48:07 +0900 (KST) Received: from luobaojun ([109.123.103.41]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OQD00352UAP1M90@mmp2.samsung.com>; Tue, 23 May 2017 10:48:07 +0900 (KST) From: BaoJun Luo To: rjw@rjwysocki.net, pavel@ucw.cz Cc: linux-pm@vger.kernel.org Subject: [PATCH] PM/hibernate: Delete the redundant parameters of the swsusp_alloc() Date: Tue, 23 May 2017 09:47:13 +0800 Message-id: <"000001d2d366$a0337ee0$e09a7ca0$@luo"@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset="utf-8" Content-transfer-encoding: 8BIT X-Mailer: Microsoft Office Outlook 12.0 Thread-index: AdLTZnz7A5U4YbncTbS9wEiPQbhhhw== Content-language: zh-cn x-cr-hashedpuzzle: AxIo BPYc Cj5+ Cq7O C4Zj GVrK KlJU KsH0 OdG3 O0Jf PcXB Tm8z T+gl WVWT aLww ehqr; 3; bABpAG4AdQB4AC0AcABtAEAAdgBnAGUAcgAuAGsAZQByAG4AZQBsAC4AbwByAGcAOwBwAGEAdgBlAGwAQAB1AGMAdwAuAGMAegA7AHIAagB3AEAAcgBqAHcAeQBzAG8AYwBrAGkALgBuAGUAdAA=; Sosha1_v1; 7; {B8CE6AB4-0C52-4095-B560-DD905BE1828B}; YgBhAG8AagB1AG4ALgBsAHUAbwBAAHMAYQBtAHMAdQBuAGcALgBjAG8AbQA=; Tue, 23 May 2017 01:47:08 GMT; WwBQAEEAVABDAEgAXQAgAFAATQAvAGgAaQBiAGUAcgBuAGEAdABlADoAIABEAGUAbABlAHQAZQAgAHQAaABlACAAcgBlAGQAdQBuAGQAYQBuAHQAIABwAGEAcgBhAG0AZQB0AGUAcgBzACAAbwBmACAAdABoAGUAIABzAHcAcwB1AHMAcABfAGEAbABsAG8AYwAoACkA x-cr-puzzleid: {B8CE6AB4-0C52-4095-B560-DD905BE1828B} X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphleLIzCtJLcpLzFFi42LZdlhTV/f6FOVIgzlTbSw+9x5htLh76iib xZnTl1gdmD22XG1n8Vix+ju7x+dNcgHMUVw2Kak5mWWpRfp2CVwZJ/ZcZSpo5a5Y07aKuYFx GmcXIyeHhICJxJ49b9ggbDGJC/fWA9lcHEICOxgl9jT+ZodwPjNK3Dn4mg2mY9P7RywQibWM Eq/eP2GGcN4yShyb+YEFpIpNQFNi+smdTCC2iICyxKufu8HizAIyEr9fLGIGsYUFwiTOt31m BbFZBFQl2lqPgsV5BewlvrZdZ4SwBSV+TL4H1asp8eLLJChbW+LJuwtAvRxAF6lLPPqrC7FK T2L7w0eMECXiEhuP3AI7VELgBotE/897zBAfmEr8OvONESLRzC6xYM1vZohBshKbDkCZLhIP GuUgyoUlXh3fwg5hS0k0vnzIBNHazSixesdVZghnCqPE9Gu3WSGqrCU2r/nFDnEFn8S7rz1Q h/JKdLQJQZgeEicXVk1gVJqF5MtZSL6cheTLWUjeWcDIsopRLLWgODc9tdiwwESvODG3uDQv XS85P3cTIziNaFnsYNxzzucQowAHoxIP7wIf5Ugh1sSy4srcQ4wSHMxKIrzbsoBCvCmJlVWp RfnxRaU5qcWHGKU5WJTEeUXXX4sQEkhPLEnNTk0tSC2CyTJxcEo1MMr87fb+/oPv04QTTy6n RbCL1Cz7etL2sscqmwTfvC/zb2dtv73JqY+5nv/GFjujWxVmf6+7xz9nv/augOObTp5hySWP 1HX/8ziWdTw0O8NWeelBTazwi7nZN7Js+/K87nps7VGvjjoc/+/1AQYPcc1Jn6tMr3EElpuY qB19oDu3fXPq2QBVNyWW4oxEQy3mouJEAMtaK1cfAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRmVeSWpSXmKPExsVy+t9jQd3rU5QjDRYe1LL43HuE0eLuqaNs FmdOX2J1YPbYcrWdxWPF6u/sHp83yQUwR7nZZKQmpqQWKaTmJeenZOal2yqFhrjpWigp5CXm ptoqRej6hgQpKZQl5pQCeUYGaMDBOcA9WEnfLsEt48Seq0wFrdwVa9pWMTcwTuPsYuTkkBAw kdj0/hELhC0mceHeerYuRi4OIYHVjBJzX35lhHDeMkocmziXGaSKTUBTYvrJnUwgtoiAssSr n7vBupkFZCR+v1gEViMsECZxvu0zK4jNIqAq0dZ6FCzOK2Av8bXtOiOELSjxY/I9oF4OoF51 iSlTciHGaEs8eXeBFSQsARR+9FcXYpOexPaHjxghSsQlNh65xQJymoTADRaJc+sfMEI8YCrx 68w3xgmMQrOQbJiFsGEWkg2zkIxawMiyipErtaA4Nz232KjAcBMjMKK2Hdby38H442z0IUYB DkYlHt4VwcqRQqyJZcWVuYcYJTiYlUR4t2UBhXhTEiurUovy44tKc1KLDzGaAj09kVlKNDkf GO15JfGGJpZGJgZmZoZGBsZmSuK8EwK/RAgJpCeWpGanphakFsH0MXFwSjUwTucycq7ojff2 8dx1asZTdWnPFSIyp0KmNeaq3N/Yyn2MY/uceF9h30cx9uEHVyyuevG3uG1vx56iGVlpCUWX Fz6crjHbYCunj5OM0fT6vemiP+sOblr5eoPQxFbBhc8lfK/NSFPL1pX7bZQivqbyzSVepjkv 9de2bI+5oJd2/Oa/hQ193M9XKLEUZyQaajEXFScCAP4dlQG+AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170523014807epcas1p44d542b7f3bb7ed19f05a11b874231c55 X-Msg-Generator: CA X-Sender-IP: 182.195.42.79 X-Local-Sender: =?UTF-8?B?6aqG5a6d5L+KG1NSQy1OYW5qaW5nLU1vYmlsZSBTb2x1dGlv?= =?UTF-8?B?biBMYWIb7IK87ISx7KCE7J6QG+mrmOe0muW3peeoi+W4iA==?= X-Global-Sender: =?UTF-8?B?QmFvanVuIEx1bxtTUkMtTmFuamluZy1Nb2JpbGUgU29sdXRp?= =?UTF-8?B?b24gTGFiG1NhbXN1bmcgRWxlY3Ryb25pY3MbU2VuaW9yIEVuZ2luZWVy?= X-Sender-Code: =?UTF-8?B?QzEwG0NIURtDMTBFRDAzRUQwMzAzMjk=?= CMS-TYPE: 101P X-CMS-RootMailID: 20170523014807epcas1p44d542b7f3bb7ed19f05a11b874231c55 X-RootMTR: 20170523014807epcas1p44d542b7f3bb7ed19f05a11b874231c55 References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From 2a91f46951c676a96621ab7505e168a2dc619064 Mon Sep 17 00:00:00 2001 From: "baojun.luo" Date: Mon, 22 May 2017 15:30:19 +0800 Subject: [PATCH] PM/hibernate: Delete the redundant parameters of the swsusp_alloc() The first parameter of swsusp_alloc has not been used. The patch to make sure to delete the redundant parameters Signed-off-by: baojun.luo --- kernel/power/snapshot.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 3b1e0f3..0f8a039 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1929,8 +1929,7 @@ static inline unsigned int alloc_highmem_pages(struct memory_bitmap *bm, * also be located in the high memory, because of the way in which * copy_data_pages() works. */ -static int swsusp_alloc(struct memory_bitmap *orig_bm, - struct memory_bitmap *copy_bm, +static int swsusp_alloc(struct memory_bitmap *copy_bm, unsigned int nr_pages, unsigned int nr_highmem) { if (nr_highmem > 0) { @@ -1976,7 +1975,7 @@ asmlinkage __visible int swsusp_save(void) return -ENOMEM; } - if (swsusp_alloc(&orig_bm, ©_bm, nr_pages, nr_highmem)) { + if (swsusp_alloc(©_bm, nr_pages, nr_highmem)) { printk(KERN_ERR "PM: Memory allocation failed\n"); return -ENOMEM; }