From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753681AbcDJOCQ (ORCPT ); Sun, 10 Apr 2016 10:02:16 -0400 Received: from out114-136.biz.mail.alibaba.com ([205.204.114.136]:46725 "EHLO out21.biz.mail.alibaba.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753152AbcDJOCO (ORCPT ); Sun, 10 Apr 2016 10:02:14 -0400 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.0773713|-1;FP=0|0|0|0|0|-1|-1|-1;HT=e02c03291;MF=chengang@emindsoft.com.cn;NM=1;PH=DS;RN=16;RT=15;SR=0;TI=SMTPD_----4h-nBZV_1460296895; From: chengang@emindsoft.com.cn To: akpm@linux-foundation.org, n-horiguchi@ah.jp.nec.com, mike.kravetz@oracle.com, hillf.zj@alibaba-inc.com, mhocko@suse.com, dingel@linux.vnet.ibm.com, dwoods@ezchip.co, baiyaowei@cmss.chinamobile.com, kirill.shutemov@linux.intel.com, aarcange@redhat.com, lizefan@huawei.com, tj@kernel.org, trivial@kernel.org Cc: linux-kernel@vger.kernel.org, Chen Gang Subject: [PATCH trivial] include : linux: hugetlb: Clean up code Date: Sun, 10 Apr 2016 22:01:31 +0800 Message-Id: <1460296891-27673-1-git-send-email-chengang@emindsoft.com.cn> X-Mailer: git-send-email 1.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chen Gang Macro HUGETLBFS_SB is clearer enough, so one statement is clearer than 3 lines statements. Remove redundant return statements for non-return functions, which can save lines, at least. Signed-off-by: Chen Gang --- include/linux/hugetlb.h | 4 +--- include/linux/hugetlb_cgroup.h | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 0f735ea..c26d463 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -353,9 +353,7 @@ extern unsigned int default_hstate_idx; static inline struct hstate *hstate_inode(struct inode *i) { - struct hugetlbfs_sb_info *hsb; - hsb = HUGETLBFS_SB(i->i_sb); - return hsb->hstate; + return HUGETLBFS_SB(i->i_sb)->hstate; } static inline struct hstate *hstate_file(struct file *f) diff --git a/include/linux/hugetlb_cgroup.h b/include/linux/hugetlb_cgroup.h index 24154c2..063962f 100644 --- a/include/linux/hugetlb_cgroup.h +++ b/include/linux/hugetlb_cgroup.h @@ -93,20 +93,17 @@ hugetlb_cgroup_commit_charge(int idx, unsigned long nr_pages, struct hugetlb_cgroup *h_cg, struct page *page) { - return; } static inline void hugetlb_cgroup_uncharge_page(int idx, unsigned long nr_pages, struct page *page) { - return; } static inline void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages, struct hugetlb_cgroup *h_cg) { - return; } static inline void hugetlb_cgroup_file_init(void) @@ -116,7 +113,6 @@ static inline void hugetlb_cgroup_file_init(void) static inline void hugetlb_cgroup_migrate(struct page *oldhpage, struct page *newhpage) { - return; } #endif /* CONFIG_MEM_RES_CTLR_HUGETLB */ -- 1.9.3