[PATCH 2/9] media: vidtv: remove more ENDIAN_BITFIELD nonsense
From: Mauro Carvalho Chehab
Date: Mon Sep 21 2020 - 07:44:21 EST
Changeset 870e350d4e39 ("media: vidtv: get rid of ENDIAN_BITFIELD nonsense")
was incomplete. There are still some wrong endannes logic at
the driver. Get rid of them.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx>
---
drivers/media/test-drivers/vidtv/vidtv_psi.h | 8 --------
drivers/media/test-drivers/vidtv/vidtv_ts.h | 13 -------------
2 files changed, 21 deletions(-)
diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.h b/drivers/media/test-drivers/vidtv/vidtv_psi.h
index c9e059bfb6eb..3f962cc78278 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_psi.h
+++ b/drivers/media/test-drivers/vidtv/vidtv_psi.h
@@ -132,17 +132,9 @@ struct vidtv_psi_table_pat {
*/
struct vidtv_psi_table_sdt_service {
__be16 service_id;
-#if defined(__LITTLE_ENDIAN_BITFIELD)
u8 EIT_present_following:1;
u8 EIT_schedule:1;
u8 reserved:6;
-#elif defined(__BIG_ENDIAN_BITFIELD)
- u8 reserved:6;
- u8 EIT_schedule:1;
- u8 EIT_present_following:1;
-#else
-#error "Unknown bitfield ordering"
-#endif
__be16 bitfield; /* running_status: 3, free_ca:1, desc_loop_len:12 */
struct vidtv_psi_desc *descriptor;
struct vidtv_psi_table_sdt_service *next;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_ts.h b/drivers/media/test-drivers/vidtv/vidtv_ts.h
index fab523723633..83dcc9183b45 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_ts.h
+++ b/drivers/media/test-drivers/vidtv/vidtv_ts.h
@@ -24,7 +24,6 @@
struct vidtv_mpeg_ts_adaption {
u8 length;
struct {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
u8 extension:1;
u8 private_data:1;
u8 splicing_point:1;
@@ -33,18 +32,6 @@ struct vidtv_mpeg_ts_adaption {
u8 priority:1;
u8 random_access:1;
u8 discontinued:1;
-#elif defined(__BIG_ENDIAN_BITFIELD)
- u8 discontinued:1;
- u8 random_access:1;
- u8 priority:1;
- u8 PCR:1;
- u8 OPCR:1;
- u8 splicing_point:1;
- u8 private_data:1;
- u8 extension:1;
-#else
-#error "Unknown bitfield ordering"
-#endif
} __packed;
u8 data[];
} __packed;
--
2.26.2