Commit 20de9fda authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

media: mtk_jpeg_core: avoid unused-variable warning 



The mtk8195_jpegenc_drvdata object was added outside of an #ifdef causing
a harmless build warning.

drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c:1879:32: error: 'mtk8195_jpegenc_drvdata' defined but not used [-Werror=unused-variable]
 1879 | static struct mtk_jpeg_variant mtk8195_jpegenc_drvdata = {
      |                                ^~~~~~~~~~~~~~~~~~~~~~~

A follow-up patch moved it inside of an #ifdef, which caused more
warnings, and a third patch ended up adding even more #ifdefs. These
were all bogus, since the actual problem here is the incorrect use
of of_ptr(). Since the driver (like any other modern platform driver)
only works in combination with CONFIG_OF, there is no point in hiding
the reference, so just remove that along with all the pointless #ifdef
checks in the driver.

This improves build coverage and avoids running into the same problem
again when another part of the driver gets changed that relies on
the #ifdef blocks to be completely matched.

Fixes: 934e8bcc ("mtk-jpegenc: support jpegenc multi-hardware")
Fixes: 4ae47770 ("media: mtk-jpegenc: Fix a compilation issue")
Fixes: da4ede4b ("media: mtk-jpeg: move data/code inside CONFIG_OF blocks")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 53ebeea5

drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c

+1 −5
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "mtk_jpeg_core.h"

#include "mtk_jpeg_dec_parse.h"



#if defined(CONFIG_OF)

static struct mtk_jpeg_fmt mtk_jpeg_enc_formats[] = {

	{

		.fourcc		= V4L2_PIX_FMT_JPEG,
@@ -102,7 +101,6 @@ static struct mtk_jpeg_fmt mtk_jpeg_dec_formats[] = { 
		.flags		= MTK_JPEG_FMT_FLAG_CAPTURE,

	},

};

#endif



#define MTK_JPEG_ENC_NUM_FORMATS ARRAY_SIZE(mtk_jpeg_enc_formats)

#define MTK_JPEG_DEC_NUM_FORMATS ARRAY_SIZE(mtk_jpeg_dec_formats)
@@ -1455,7 +1453,6 @@ static const struct dev_pm_ops mtk_jpeg_pm_ops = { 
	SET_RUNTIME_PM_OPS(mtk_jpeg_pm_suspend, mtk_jpeg_pm_resume, NULL)

};



#if defined(CONFIG_OF)

static int mtk_jpegenc_get_hw(struct mtk_jpeg_ctx *ctx)

{

	struct mtk_jpegenc_comp_dev *comp_jpeg;
@@ -1951,14 +1948,13 @@ static const struct of_device_id mtk_jpeg_match[] = { 
};



MODULE_DEVICE_TABLE(of, mtk_jpeg_match);

#endif



static struct platform_driver mtk_jpeg_driver = {

	.probe = mtk_jpeg_probe,

	.remove_new = mtk_jpeg_remove,

	.driver = {

		.name           = MTK_JPEG_NAME,

		.of_match_table = of_match_ptr(mtk_jpeg_match),

		.of_match_table = mtk_jpeg_match,

		.pm             = &mtk_jpeg_pm_ops,

	},

};

drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c

+1 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ enum mtk_jpeg_color { 
	MTK_JPEG_COLOR_400		= 0x00110000

};



#if defined(CONFIG_OF)

static const struct of_device_id mtk_jpegdec_hw_ids[] = {

	{

		.compatible = "mediatek,mt8195-jpgdec-hw",
@@ -47,7 +46,6 @@ static const struct of_device_id mtk_jpegdec_hw_ids[] = { 
	{},

};

MODULE_DEVICE_TABLE(of, mtk_jpegdec_hw_ids);

#endif



static inline int mtk_jpeg_verify_align(u32 val, int align, u32 reg)

{
@@ -653,7 +651,7 @@ static struct platform_driver mtk_jpegdec_hw_driver = { 
	.probe = mtk_jpegdec_hw_probe,

	.driver = {

		.name = "mtk-jpegdec-hw",

		.of_match_table = of_match_ptr(mtk_jpegdec_hw_ids),

		.of_match_table = mtk_jpegdec_hw_ids,

	},

};

drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c

+1 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ static const struct mtk_jpeg_enc_qlt mtk_jpeg_enc_quality[] = { 
	{.quality_param = 97, .hardware_value = JPEG_ENC_QUALITY_Q97},

};



#if defined(CONFIG_OF)

static const struct of_device_id mtk_jpegenc_drv_ids[] = {

	{

		.compatible = "mediatek,mt8195-jpgenc-hw",
@@ -54,7 +53,6 @@ static const struct of_device_id mtk_jpegenc_drv_ids[] = { 
	{},

};

MODULE_DEVICE_TABLE(of, mtk_jpegenc_drv_ids);

#endif



void mtk_jpeg_enc_reset(void __iomem *base)

{
@@ -377,7 +375,7 @@ static struct platform_driver mtk_jpegenc_hw_driver = { 
	.probe = mtk_jpegenc_hw_probe,

	.driver = {

		.name = "mtk-jpegenc-hw",

		.of_match_table = of_match_ptr(mtk_jpegenc_drv_ids),

		.of_match_table = mtk_jpegenc_drv_ids,

	},

};