diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 37eeef9841c4..02d9a8af3704 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -863,15 +863,10 @@ static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift,
 }
 #endif
 
-static inline struct hstate *folio_hstate(struct folio *folio)
-{
-	VM_BUG_ON_FOLIO(!folio_test_hugetlb(folio), folio);
-	return size_to_hstate(folio_size(folio));
-}
-
 static inline struct hstate *page_hstate(struct page *page)
 {
-	return folio_hstate(page_folio(page));
+	VM_BUG_ON_PAGE(!PageHuge(page), page);
+	return size_to_hstate(page_size(page));
 }
 
 static inline unsigned hstate_index_to_shift(unsigned index)
@@ -1082,11 +1077,6 @@ static inline struct hstate *hstate_vma(struct vm_area_struct *vma)
 	return NULL;
 }
 
-static inline struct hstate *folio_hstate(struct folio *folio)
-{
-	return NULL;
-}
-
 static inline struct hstate *page_hstate(struct page *page)
 {
 	return NULL;
diff --git a/mm/migrate.c b/mm/migrate.c
index 2c288246c0be..954c04f28eb9 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1640,7 +1640,7 @@ struct page *alloc_migration_target(struct page *page, unsigned long private)
 		nid = folio_nid(folio);
 
 	if (folio_test_hugetlb(folio)) {
-		struct hstate *h = folio_hstate(folio);
+		struct hstate *h = page_hstate(&folio->page);
 
 		gfp_mask = htlb_modify_alloc_mask(h, gfp_mask);
 		return alloc_huge_page_nodemask(h, nid, mtc->nmask, gfp_mask);