Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Stanislaw Gruszka and committed by
Hans Verkuil
c12bbc28 c139c1ac

+1 -6
+1 -1
drivers/media/pci/intel/ipu6/ipu6-isys-video.c
··· 241 241 else 242 242 *bytesperline = DIV_ROUND_UP(*width * pfmt->bpp, BITS_PER_BYTE); 243 243 244 - *bytesperline = ALIGN(*bytesperline, av->isys->line_align); 244 + *bytesperline = ALIGN(*bytesperline, 64); 245 245 246 246 /* 247 247 * (height + 1) * bytesperline due to a hardware issue: the DMA unit
-1
drivers/media/pci/intel/ipu6/ipu6-isys.c
··· 1089 1089 INIT_LIST_HEAD(&isys->framebuflist); 1090 1090 INIT_LIST_HEAD(&isys->framebuflist_fw); 1091 1091 1092 - isys->line_align = IPU6_ISYS_2600_MEM_LINE_ALIGN; 1093 1092 isys->icache_prefetch = 0; 1094 1093 1095 1094 dev_set_drvdata(&auxdev->dev, isys);
-4
drivers/media/pci/intel/ipu6/ipu6-isys.h
··· 29 29 IPU6_ISYS_UNISPART_IRQ_CSI0 | \ 30 30 IPU6_ISYS_UNISPART_IRQ_CSI1) 31 31 32 - #define IPU6_ISYS_2600_MEM_LINE_ALIGN 64 33 - 34 32 /* 35 33 * Current message queue configuration. These must be big enough 36 34 * so that they never gets full. Queues are located in system memory ··· 116 118 * @streams: streams per firmware stream ID 117 119 * @fwcom: fw communication layer private pointer 118 120 * or optional external library private pointer 119 - * @line_align: line alignment in memory 120 121 * @phy_termcal_val: the termination calibration value, only used for DWC PHY 121 122 * @need_reset: Isys requires d0i0->i3 transition 122 123 * @ref_count: total number of callers fw open ··· 137 140 struct ipu6_isys_stream streams[IPU6_ISYS_MAX_STREAMS]; 138 141 int streams_ref_count[IPU6_ISYS_MAX_STREAMS]; 139 142 void *fwcom; 140 - unsigned int line_align; 141 143 u32 phy_termcal_val; 142 144 bool need_reset; 143 145 bool icache_prefetch;