return __hugetlb_cgroup_from_page(page, true);
 }
 
-static inline int __set_hugetlb_cgroup(struct page *page,
+static inline void __set_hugetlb_cgroup(struct page *page,
                                       struct hugetlb_cgroup *h_cg, bool rsvd)
 {
        VM_BUG_ON_PAGE(!PageHuge(page), page);
 
        if (compound_order(page) < HUGETLB_CGROUP_MIN_ORDER)
-               return -1;
+               return;
        if (rsvd)
                set_page_private(page + SUBPAGE_INDEX_CGROUP_RSVD,
                                 (unsigned long)h_cg);
        else
                set_page_private(page + SUBPAGE_INDEX_CGROUP,
                                 (unsigned long)h_cg);
-       return 0;
 }
 
-static inline int set_hugetlb_cgroup(struct page *page,
+static inline void set_hugetlb_cgroup(struct page *page,
                                     struct hugetlb_cgroup *h_cg)
 {
-       return __set_hugetlb_cgroup(page, h_cg, false);
+       __set_hugetlb_cgroup(page, h_cg, false);
 }
 
-static inline int set_hugetlb_cgroup_rsvd(struct page *page,
+static inline void set_hugetlb_cgroup_rsvd(struct page *page,
                                          struct hugetlb_cgroup *h_cg)
 {
-       return __set_hugetlb_cgroup(page, h_cg, true);
+       __set_hugetlb_cgroup(page, h_cg, true);
 }
 
 static inline bool hugetlb_cgroup_disabled(void)
        return NULL;
 }
 
-static inline int set_hugetlb_cgroup(struct page *page,
+static inline void set_hugetlb_cgroup(struct page *page,
                                     struct hugetlb_cgroup *h_cg)
 {
-       return 0;
 }
 
-static inline int set_hugetlb_cgroup_rsvd(struct page *page,
+static inline void set_hugetlb_cgroup_rsvd(struct page *page,
                                          struct hugetlb_cgroup *h_cg)
 {
-       return 0;
 }
 
 static inline bool hugetlb_cgroup_disabled(void)