media: nxp: imx8-isi: Two build fixes
Subsystems (3)
cover media: nxp: imx8-isi: Two build fixes
These popped up last night as I was trying to merge in Linus' master.
PATCH 1/2 media: nxp: imx8-isi: Fix unusued function warnings
From: Palmer Dabbelt <[email protected]>
I just stumbled into these when trying to test against Linus' master.
Signed-off-by Palmer Dabbelt <[email protected]>
--- drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +2 -2
@@ -311,7 +311,7 @@ static const struct mxc_isi_plat_data mxc_imx8mp_data = {* Power management */ -static int mxc_isi_pm_suspend (struct device *dev) +static int __maybe_unused mxc_isi_pm_suspend (struct device *dev) {struct mxc_isi_dev *isi =dev_get_drvdata (dev);unsigned int i;
@@ -325,7 +325,7 @@ static int mxc_isi_pm_suspend(struct device *dev)return pm_runtime_force_suspend (dev); } -static int mxc_isi_pm_resume (struct device *dev) +static int __maybe_unused mxc_isi_pm_resume (struct device *dev) {struct mxc_isi_dev *isi =dev_get_drvdata (dev);unsigned int i;
Signature · 1 line
2.40.0
PATCH 2/2 media: nxp: imx8-isi: Fix undefined config warnings
In reply to Palmer DabbeltFrom: Palmer Dabbelt <[email protected]>
These show up as warnings related to the implicit 0 for undefined macros.
Signed-off-by Palmer Dabbelt <[email protected]>
--- drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c +3 -3
@@ -30,7 +30,7 @@ static inline void mxc_isi_write(struct mxc_isi_pipe *pipe, u32 reg, u32 val)void mxc_isi_channel_set_inbuf (struct mxc_isi_pipe *pipe,dma_addr_t dma_addr) {mxc_isi_write (pipe,CHNL_IN_BUF_ADDR , dma_addr); -#if CONFIG_ARCH_DMA_ADDR_T_64BIT +#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT )if (pipe->isi->pdata->has_36bit_dma)mxc_isi_write (pipe,CHNL_IN_BUF_XTND_ADDR , dma_addr >>32 );#endif
@@ -48,7 +48,7 @@ void mxc_isi_channel_set_outbuf(struct mxc_isi_pipe *pipe,mxc_isi_write (pipe,CHNL_OUT_BUF1_ADDR_Y , dma_addrs[0 ]);mxc_isi_write (pipe,CHNL_OUT_BUF1_ADDR_U , dma_addrs[1 ]);mxc_isi_write (pipe,CHNL_OUT_BUF1_ADDR_V , dma_addrs[2 ]); -#if CONFIG_ARCH_DMA_ADDR_T_64BIT +#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT )if (pipe->isi->pdata->has_36bit_dma) {mxc_isi_write (pipe,CHNL_Y_BUF1_XTND_ADDR , dma_addrs[0 ] >>32 );
@@ -63,7 +63,7 @@ void mxc_isi_channel_set_outbuf(struct mxc_isi_pipe *pipe,mxc_isi_write (pipe,CHNL_OUT_BUF2_ADDR_Y , dma_addrs[0 ]);mxc_isi_write (pipe,CHNL_OUT_BUF2_ADDR_U , dma_addrs[1 ]);mxc_isi_write (pipe,CHNL_OUT_BUF2_ADDR_V , dma_addrs[2 ]); -#if CONFIG_ARCH_DMA_ADDR_T_64BIT +#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT )if (pipe->isi->pdata->has_36bit_dma) {mxc_isi_write (pipe,CHNL_Y_BUF2_XTND_ADDR , dma_addrs[0 ] >>32 );
Signature · 1 line
2.40.0
Quoted 1 line · Palmer Dabbelt
These popped up last night as I was trying to merge in Linus' master.
Hi Palmer,
These have been already fixes in Linus's tree.
Signature · 1 line
Sakari Ailus