diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 0c5326fd3c47..1c6f35ba1604 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -625,50 +625,26 @@ enum hugetlb_page_flags {
  */
 #ifdef CONFIG_HUGETLB_PAGE
 #define TESTHPAGEFLAG(uname, flname)				\
-static __always_inline						\
-bool folio_test_hugetlb_##flname(struct folio *folio)		\
-	{	void *private = &folio->private;		\
-		return test_bit(HPG_##flname, private);		\
-	}							\
 static inline int HPage##uname(struct page *page)		\
 	{ return test_bit(HPG_##flname, &(page->private)); }
 
 #define SETHPAGEFLAG(uname, flname)				\
-static __always_inline						\
-void folio_set_hugetlb_##flname(struct folio *folio)		\
-	{	void *private = &folio->private;		\
-		set_bit(HPG_##flname, private);			\
-	}							\
 static inline void SetHPage##uname(struct page *page)		\
 	{ set_bit(HPG_##flname, &(page->private)); }
 
 #define CLEARHPAGEFLAG(uname, flname)				\
-static __always_inline						\
-void folio_clear_hugetlb_##flname(struct folio *folio)		\
-	{	void *private = &folio->private;		\
-		clear_bit(HPG_##flname, private);		\
-	}							\
 static inline void ClearHPage##uname(struct page *page)		\
 	{ clear_bit(HPG_##flname, &(page->private)); }
 #else
 #define TESTHPAGEFLAG(uname, flname)				\
-static inline bool						\
-folio_test_hugetlb_##flname(struct folio *folio)		\
-	{ return 0; }						\
 static inline int HPage##uname(struct page *page)		\
 	{ return 0; }
 
 #define SETHPAGEFLAG(uname, flname)				\
-static inline void						\
-folio_set_hugetlb_##flname(struct folio *folio) 		\
-	{ }							\
 static inline void SetHPage##uname(struct page *page)		\
 	{ }
 
 #define CLEARHPAGEFLAG(uname, flname)				\
-static inline void						\
-folio_clear_hugetlb_##flname(struct folio *folio)		\
-	{ }							\
 static inline void ClearHPage##uname(struct page *page)		\
 	{ }
 #endif