| Message ID | 20250211113409.1517534-30-angelogioacchino.delregno@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add support for MT8195/88 DPI, HDMIv2 and DDCv2 | expand |
On Tue, 2025-02-11 at 12:33 +0100, AngeloGioacchino Del Regno wrote: > External email : Please do not click links or open attachments until you have verified the sender or the content. > > > Since the SIMPLE_DEV_PM_OPS macro and the pm pointer are anyway > defined when CONFIG_PM_SLEEP is not set, remove the ifdef for it > and indicate that the mtk_hdmi_{remove,suspend} functions may be > unused (as they are, in case PM support is not built-in). > > While at it, to improve readability, also compress the > SIMPLE_DEV_PM_OPS declaration as it even fits in less > than 80 columns. Reviewed-by: CK Hu <ck.hu@mediatek.com> > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > drivers/gpu/drm/mediatek/mtk_hdmi.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c > index e391cdacd9ee..ae5023298ff4 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c > @@ -1694,8 +1694,7 @@ static void mtk_hdmi_remove(struct platform_device *pdev) > mtk_hdmi_clk_disable_audio(hdmi); > } > > -#ifdef CONFIG_PM_SLEEP > -static int mtk_hdmi_suspend(struct device *dev) > +static __maybe_unused int mtk_hdmi_suspend(struct device *dev) > { > struct mtk_hdmi *hdmi = dev_get_drvdata(dev); > > @@ -1704,7 +1703,7 @@ static int mtk_hdmi_suspend(struct device *dev) > return 0; > } > > -static int mtk_hdmi_resume(struct device *dev) > +static __maybe_unused int mtk_hdmi_resume(struct device *dev) > { > struct mtk_hdmi *hdmi = dev_get_drvdata(dev); > int ret = 0; > @@ -1717,9 +1716,8 @@ static int mtk_hdmi_resume(struct device *dev) > > return 0; > } > -#endif > -static SIMPLE_DEV_PM_OPS(mtk_hdmi_pm_ops, > - mtk_hdmi_suspend, mtk_hdmi_resume); > + > +static SIMPLE_DEV_PM_OPS(mtk_hdmi_pm_ops, mtk_hdmi_suspend, mtk_hdmi_resume); > > static const struct mtk_hdmi_conf mtk_hdmi_conf_mt2701 = { > .tz_disabled = true, > -- > 2.48.1 >
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index e391cdacd9ee..ae5023298ff4 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1694,8 +1694,7 @@ static void mtk_hdmi_remove(struct platform_device *pdev) mtk_hdmi_clk_disable_audio(hdmi); } -#ifdef CONFIG_PM_SLEEP -static int mtk_hdmi_suspend(struct device *dev) +static __maybe_unused int mtk_hdmi_suspend(struct device *dev) { struct mtk_hdmi *hdmi = dev_get_drvdata(dev); @@ -1704,7 +1703,7 @@ static int mtk_hdmi_suspend(struct device *dev) return 0; } -static int mtk_hdmi_resume(struct device *dev) +static __maybe_unused int mtk_hdmi_resume(struct device *dev) { struct mtk_hdmi *hdmi = dev_get_drvdata(dev); int ret = 0; @@ -1717,9 +1716,8 @@ static int mtk_hdmi_resume(struct device *dev) return 0; } -#endif -static SIMPLE_DEV_PM_OPS(mtk_hdmi_pm_ops, - mtk_hdmi_suspend, mtk_hdmi_resume); + +static SIMPLE_DEV_PM_OPS(mtk_hdmi_pm_ops, mtk_hdmi_suspend, mtk_hdmi_resume); static const struct mtk_hdmi_conf mtk_hdmi_conf_mt2701 = { .tz_disabled = true,
Since the SIMPLE_DEV_PM_OPS macro and the pm pointer are anyway defined when CONFIG_PM_SLEEP is not set, remove the ifdef for it and indicate that the mtk_hdmi_{remove,suspend} functions may be unused (as they are, in case PM support is not built-in). While at it, to improve readability, also compress the SIMPLE_DEV_PM_OPS declaration as it even fits in less than 80 columns. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- drivers/gpu/drm/mediatek/mtk_hdmi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)