Switch drivers to using the macro. No functional changes intended.
Signed-off-by: Yury Norov <[email protected]>
---
drivers/block/null_blk/main.c | 6 ++----
drivers/gpu/drm/i915/gt/shmem_utils.c | 5 ++---
drivers/md/dm-pcache/backing_dev.h | 2 +-
sound/virtio/virtio_pcm_msg.c | 4 ++--
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
index f8c0fd57e041..89e9651b09a9 100644
--- a/drivers/block/null_blk/main.c
+++ b/drivers/block/null_blk/main.c
@@ -1147,8 +1147,7 @@ static blk_status_t copy_to_nullb(struct nullb *nullb,
void *source,
sector_t sector;
while (count < n) {
- temp = min3(nullb->dev->blocksize, n - count,
- PAGE_SIZE - offset_in_page(pos));
+ temp = min3(nullb->dev->blocksize, n - count,
rest_of_page(pos));
sector = pos >> SECTOR_SHIFT;
if (null_cache_active(nullb) && !is_fua)
@@ -1181,8 +1180,7 @@ static void copy_from_nullb(struct nullb *nullb, void
*dest, loff_t pos,
sector_t sector;
while (count < n) {
- temp = min3(nullb->dev->blocksize, n - count,
- PAGE_SIZE - offset_in_page(pos));
+ temp = min3(nullb->dev->blocksize, n - count,
rest_of_page(pos));
sector = pos >> SECTOR_SHIFT;
t_page = null_lookup_page(nullb, sector, false,
diff --git a/drivers/gpu/drm/i915/gt/shmem_utils.c
b/drivers/gpu/drm/i915/gt/shmem_utils.c
index 5850adaebf82..9a0a6f67fef0 100644
--- a/drivers/gpu/drm/i915/gt/shmem_utils.c
+++ b/drivers/gpu/drm/i915/gt/shmem_utils.c
@@ -99,8 +99,7 @@ static int __shmem_rw(struct file *file, loff_t off,
unsigned long pfn;
for (pfn = off >> PAGE_SHIFT; len; pfn++) {
- unsigned int this =
- min_t(size_t, PAGE_SIZE - offset_in_page(off), len);
+ unsigned int this = min_t(size_t, rest_of_page(off), len);
struct page *page;
void *vaddr;
@@ -135,7 +134,7 @@ int shmem_read_to_iosys_map(struct file *file, loff_t off,
for (pfn = off >> PAGE_SHIFT; len; pfn++) {
unsigned int this =
- min_t(size_t, PAGE_SIZE - offset_in_page(off), len);
+ min_t(size_t, rest_of_page(off), len);
struct page *page;
void *vaddr;
diff --git a/drivers/md/dm-pcache/backing_dev.h
b/drivers/md/dm-pcache/backing_dev.h
index b371cba483b9..17e83b38b845 100644
--- a/drivers/md/dm-pcache/backing_dev.h
+++ b/drivers/md/dm-pcache/backing_dev.h
@@ -96,7 +96,7 @@ static inline u32 backing_dev_req_coalesced_max_len(const
void *data, u32 len)
first_page = vmalloc_to_page(p);
advance:
- in_page = PAGE_SIZE - offset_in_page(p);
+ in_page = rest_of_page(p);
to_advance = min_t(u32, in_page, len - done);
done += to_advance;
diff --git a/sound/virtio/virtio_pcm_msg.c b/sound/virtio/virtio_pcm_msg.c
index a5c4e7027717..5d1b0dc08234 100644
--- a/sound/virtio/virtio_pcm_msg.c
+++ b/sound/virtio/virtio_pcm_msg.c
@@ -56,7 +56,7 @@ static int virtsnd_pcm_sg_num(u8 *data, unsigned int length)
phys_addr_t pg_address = page_to_phys(pg);
size_t pg_length;
- pg_length = PAGE_SIZE - offset_in_page(data);
+ pg_length = rest_of_page(data);
if (pg_length > length)
pg_length = length;
@@ -96,7 +96,7 @@ static void virtsnd_pcm_sg_from(struct scatterlist *sgs, int
nsgs, u8 *data,
struct page *pg = vmalloc_to_page(data);
size_t pg_length;
- pg_length = PAGE_SIZE - offset_in_page(data);
+ pg_length = rest_of_page(data);
if (pg_length > length)
pg_length = length;
--
2.43.0
