[PATCH RFC 03/11] media: vidtv: fix 32-bit warnings

Mauro Carvalho Chehab
2020-09-14T09:04:17Z

There are several warnings produced when the driver is built
for 32-bit archs. Solve them.

Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
drivers/media/test-drivers/vidtv/vidtv_common.c | 4 ++--
drivers/media/test-drivers/vidtv/vidtv_pes.c | 12 +++---------
drivers/media/test-drivers/vidtv/vidtv_s302m.c | 2 +-
3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/media/test-drivers/vidtv/vidtv_common.c b/drivers/media/test-drivers/vidtv/vidtv_common.c
index 9093df32e0ab..63b3055bd715 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_common.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_common.c
@@ -42,7 +42,7 @@ u32 vidtv_memcpy(void *to,
size_t len)
{
if (unlikely(to_offset + len > to_size)) {
- pr_err_ratelimited("overflow detected, skipping. Try increasing the buffer size. Needed %lu, had %zu\n",
+ pr_err_ratelimited("overflow detected, skipping. Try increasing the buffer size. Needed %zu, had %zu\n",
to_offset + len,
to_size);
return 0;
@@ -78,7 +78,7 @@ u32 vidtv_memset(void *to,
size_t len)
{
if (unlikely(to_offset + len > to_size)) {
- pr_err_ratelimited("overflow detected, skipping. Try increasing the buffer size. Needed %lu, had %zu\n",
+ pr_err_ratelimited("overflow detected, skipping. Try increasing the buffer size. Needed %zu, had %zu\n",
to_offset + len,
to_size);
return 0;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_pes.c b/drivers/media/test-drivers/vidtv/vidtv_pes.c
index 8237434f3fc2..34518ef042f7 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_pes.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_pes.c
@@ -90,15 +90,9 @@ static u32 vidtv_pes_write_pts_dts(struct pes_header_write_args args)
if (!args.send_pts && args.send_dts)
return 0;

- #ifdef __BIG_ENDIAN
- mask1 = GENMASK(30, 32);
- mask2 = GENMASK(15, 29);
- mask3 = GENMASK(0, 14);
- #else
- mask1 = GENMASK(32, 30);
- mask2 = GENMASK(29, 15);
- mask3 = GENMASK(14, 0);
- #endif
+ mask1 = GENMASK_ULL(32, 30);
+ mask2 = GENMASK_ULL(29, 15);
+ mask3 = GENMASK_ULL(14, 0);

/* see ISO/IEC 13818-1 : 2000 p. 32 */
if (args.send_pts && args.send_dts) {
diff --git a/drivers/media/test-drivers/vidtv/vidtv_s302m.c b/drivers/media/test-drivers/vidtv/vidtv_s302m.c
index 3b20a26d8721..5ae2ede951eb 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_s302m.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_s302m.c
@@ -422,7 +422,7 @@ static void vidtv_s302m_write_frames(struct vidtv_encoder *e)
au->nbytes = nbytes_per_unit;

if (au_sz + sizeof(struct vidtv_smpte_s302m_es) != nbytes_per_unit) {
- pr_warn_ratelimited("write size was %d, expected %lu\n",
+ pr_warn_ratelimited("write size was %u, expected %zu\n",
nbytes_per_unit,
au_sz + sizeof(struct vidtv_smpte_s302m_es));
}
--
2.26.2