block: use page_to_phys in bvec_phys

Christoph Hellwig · axboe · commit 2caca8fc7aad · 2025-01-06T07:36:39.000-07:00
Use page_to_phys instead of open coding it now that it is available in an architecture independent way. Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20250106081437.798213-1-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/include/linux/bvec.h b/include/linux/bvec.h
@@ -286,12 +286,7 @@ static inline void *bvec_virt(struct bio_vec *bvec)
  */
 static inline phys_addr_t bvec_phys(const struct bio_vec *bvec)
 {
-	/*
-	 * Note this open codes page_to_phys because page_to_phys is defined in
-	 * <asm/io.h>, which we don't want to pull in here.  If it ever moves to
-	 * a sensible place we should start using it.
-	 */
-	return PFN_PHYS(page_to_pfn(bvec->bv_page)) + bvec->bv_offset;
+	return page_to_phys(bvec->bv_page) + bvec->bv_offset;
 }
 
 #endif /* __LINUX_BVEC_H */

Original file line number	Diff line number	Diff line change
`@@ -286,12 +286,7 @@ static inline void bvec_virt(struct bio_vec bvec)`
`286`	`286`	`*/`
`287`	`287`	`static inline phys_addr_t bvec_phys(const struct bio_vec *bvec)`
`288`	`288`	`{`
`289`		`- /*`
`290`		`- * Note this open codes page_to_phys because page_to_phys is defined in`
`291`		`- * <asm/io.h>, which we don't want to pull in here. If it ever moves to`
`292`		`- * a sensible place we should start using it.`
`293`		`- */`
`294`		`- return PFN_PHYS(page_to_pfn(bvec->bv_page)) + bvec->bv_offset;`
	`289`	`+ return page_to_phys(bvec->bv_page) + bvec->bv_offset;`
`295`	`290`	`}`
`296`	`291`
`297`	`292`	`#endif /* __LINUX_BVEC_H */`