media: intel/ipu6: Remove line_align

isys->line_align value is only used in one place and we can just use
the proper value directly there.

Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
index 33ff938caa709d7f29ac2a5591b995436fb43f1e..24a2ef93474cc400f64eb1d50bc760ee66124d1b 100644 (file)
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
@@ -241,7 +241,7 @@ static void ipu6_isys_try_fmt_cap(struct ipu6_isys_video *av, u32 type,
        else
                *bytesperline = DIV_ROUND_UP(*width * pfmt->bpp, BITS_PER_BYTE);
 
-       *bytesperline = ALIGN(*bytesperline, av->isys->line_align);
+       *bytesperline = ALIGN(*bytesperline, 64);
 
        /*
         * (height + 1) * bytesperline due to a hardware issue: the DMA unit

diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.c b/drivers/media/pci/intel/ipu6/ipu6-isys.c
index 7b09782ab679280b29cded3ebbabb49fbba78321..fc0ec0a4b8f54754f795b40268bae2bea446e267 100644 (file)
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.c
@@ -1089,7 +1089,6 @@ static int isys_probe(struct auxiliary_device *auxdev,
        INIT_LIST_HEAD(&isys->framebuflist);
        INIT_LIST_HEAD(&isys->framebuflist_fw);
 
-       isys->line_align = IPU6_ISYS_2600_MEM_LINE_ALIGN;
        isys->icache_prefetch = 0;
 
        dev_set_drvdata(&auxdev->dev, isys);

diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.h b/drivers/media/pci/intel/ipu6/ipu6-isys.h
index 610b60e69152b6f262c4d207fadae47950549d18..f488e782c26e236b8a6d88b710c82af241fec22b 100644 (file)
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.h
@@ -29,8 +29,6 @@ struct ipu6_bus_device;
                                 IPU6_ISYS_UNISPART_IRQ_CSI0 |  \
                                 IPU6_ISYS_UNISPART_IRQ_CSI1)
 
-#define IPU6_ISYS_2600_MEM_LINE_ALIGN  64
-
 /*
  * Current message queue configuration. These must be big enough
  * so that they never gets full. Queues are located in system memory
@@ -118,7 +116,6 @@ struct sensor_async_sd {
  * @streams: streams per firmware stream ID
  * @fwcom: fw communication layer private pointer
  *         or optional external library private pointer
- * @line_align: line alignment in memory
  * @phy_termcal_val: the termination calibration value, only used for DWC PHY
  * @need_reset: Isys requires d0i0->i3 transition
  * @ref_count: total number of callers fw open
@@ -140,7 +137,6 @@ struct ipu6_isys {
        struct ipu6_isys_stream streams[IPU6_ISYS_MAX_STREAMS];
        int streams_ref_count[IPU6_ISYS_MAX_STREAMS];
        void *fwcom;
-       unsigned int line_align;
        u32 phy_termcal_val;
        bool need_reset;
        bool icache_prefetch;