media: mgb4: Defines cleanup

Do not define stuff used in a single source file in a global header.
Do not mix defines with "bare" values in the initialization.

Signed-off-by: Martin Tůma <martin.tuma@digiteqautomotive.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/pci/mgb4/mgb4_core.c b/drivers/media/pci/mgb4/mgb4_core.c
index bc63dc81bcae0d20924174be74b93a2139d5879f..8ceaed5c14531177691dbc4248cb0c4b92402b7f 100644 (file)
--- a/drivers/media/pci/mgb4/mgb4_core.c
+++ b/drivers/media/pci/mgb4/mgb4_core.c
@@ -40,7 +40,9 @@
 #include "mgb4_trigger.h"
 #include "mgb4_core.h"
 
-#define MGB4_USER_IRQS 16
+#define MGB4_USER_IRQS  16
+#define MGB4_MGB4_BAR_ID 0
+#define MGB4_XDMA_BAR_ID 1
 
 #define DIGITEQ_VID 0x1ed8
 #define T100_DID    0x0101

diff --git a/drivers/media/pci/mgb4/mgb4_core.h b/drivers/media/pci/mgb4/mgb4_core.h
index 9aec62514c0be94a5fb9a8073455a21ecf0ad09d..e86742d7b6c4352ac28d369c2e1fcd5daade7115 100644 (file)
--- a/drivers/media/pci/mgb4/mgb4_core.h
+++ b/drivers/media/pci/mgb4/mgb4_core.h
@@ -18,9 +18,6 @@
 #define MGB4_VIN_DEVICES  2
 #define MGB4_VOUT_DEVICES 2
 
-#define MGB4_MGB4_BAR_ID  0
-#define MGB4_XDMA_BAR_ID  1
-
 #define MGB4_IS_GMSL(mgbdev) \
        ((mgbdev)->module_version >> 4 == 2)
 #define MGB4_IS_FPDL3(mgbdev) \

diff --git a/drivers/media/pci/mgb4/mgb4_vout.c b/drivers/media/pci/mgb4/mgb4_vout.c
index 600f858918e7689a0029daa7993edae08b707d70..14c5725bd4d80fb26cfe0a0eaf748548311e68ce 100644 (file)
--- a/drivers/media/pci/mgb4/mgb4_vout.c
+++ b/drivers/media/pci/mgb4/mgb4_vout.c
@@ -24,10 +24,6 @@
 #include "mgb4_cmt.h"
 #include "mgb4_vout.h"
 
-#define DEFAULT_WIDTH     1280
-#define DEFAULT_HEIGHT    640
-#define DEFAULT_PERIOD    (MGB4_HW_FREQ / 60)
-
 ATTRIBUTE_GROUPS(mgb4_fpdl3_out);
 ATTRIBUTE_GROUPS(mgb4_gmsl_out);
 
@@ -664,11 +660,10 @@ static void fpga_init(struct mgb4_vout_dev *voutdev)
        const struct mgb4_vout_regs *regs = &voutdev->config->regs;
 
        mgb4_write_reg(video, regs->config, 0x00000011);
-       mgb4_write_reg(video, regs->resolution,
-                      (DEFAULT_WIDTH << 16) | DEFAULT_HEIGHT);
+       mgb4_write_reg(video, regs->resolution, (1280 << 16) | 640);
        mgb4_write_reg(video, regs->hsync, 0x00283232);
        mgb4_write_reg(video, regs->vsync, 0x40141F1E);
-       mgb4_write_reg(video, regs->frame_limit, DEFAULT_PERIOD);
+       mgb4_write_reg(video, regs->frame_limit, MGB4_HW_FREQ / 60);
        mgb4_write_reg(video, regs->padding, 0x00000000);
 
        voutdev->freq = mgb4_cmt_set_vout_freq(voutdev, 61150 >> 1) << 1;