drm/arc: Inline arcpgu_drm_hdmi_init

Really not worth the function, much less the separate file now that
almost all the code is gone.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210112084358.2771527-12-daniel.vetter@ffwll.ch

diff --git a/drivers/gpu/drm/arc/Makefile b/drivers/gpu/drm/arc/Makefile
index c686e02..379a114 100644 (file)
--- a/drivers/gpu/drm/arc/Makefile
+++ b/drivers/gpu/drm/arc/Makefile
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
-arcpgu-y := arcpgu_hdmi.o arcpgu_sim.o arcpgu_drv.o
+arcpgu-y := arcpgu_sim.o arcpgu_drv.o
 obj-$(CONFIG_DRM_ARCPGU) += arcpgu.o

diff --git a/drivers/gpu/drm/arc/arcpgu.h b/drivers/gpu/drm/arc/arcpgu.h
index cee2448..7dce0c2 100644 (file)
--- a/drivers/gpu/drm/arc/arcpgu.h
+++ b/drivers/gpu/drm/arc/arcpgu.h
@@ -34,7 +34,6 @@ static inline u32 arc_pgu_read(struct arcpgu_drm_private *arcpgu,
        return ioread32(arcpgu->regs + reg);
 }
 
-int arcpgu_drm_hdmi_init(struct drm_device *drm, struct device_node *np);
 int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np);
 
 #endif

diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c
index 315c46f..e96d7ce 100644 (file)
--- a/drivers/gpu/drm/arc/arcpgu_drv.c
+++ b/drivers/gpu/drm/arc/arcpgu_drv.c
@@ -221,9 +221,15 @@ static int arcpgu_load(struct arcpgu_drm_private *arcpgu)
        }
 
        if (encoder_node) {
-               ret = arcpgu_drm_hdmi_init(drm, encoder_node);
-               of_node_put(encoder_node);
-               if (ret < 0)
+               struct drm_bridge *bridge;
+
+               /* Locate drm bridge from the hdmi encoder DT node */
+               bridge = of_drm_find_bridge(encoder_node);
+               if (!bridge)
+                       return -EPROBE_DEFER;
+
+               ret = drm_simple_display_pipe_attach_bridge(&arcpgu->pipe, bridge);
+               if (ret)
                        return ret;
        } else {
                dev_info(drm->dev, "no encoder found. Assumed virtual LCD on simulation platform\n");

diff --git a/drivers/gpu/drm/arc/arcpgu_hdmi.c b/drivers/gpu/drm/arc/arcpgu_hdmi.c
deleted file mode 100644 (file)
index d430af6..0000000
--- a/drivers/gpu/drm/arc/arcpgu_hdmi.c
+++ /dev/null
@@ -1,27 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * ARC PGU DRM driver.
- *
- * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com)
- */
-
-#include <drm/drm_bridge.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_encoder.h>
-#include <drm/drm_device.h>
-
-#include "arcpgu.h"
-
-int arcpgu_drm_hdmi_init(struct drm_device *drm, struct device_node *np)
-{
-       struct arcpgu_drm_private *arcpgu = dev_to_arcpgu(drm);
-       struct drm_bridge *bridge;
-
-       /* Locate drm bridge from the hdmi encoder DT node */
-       bridge = of_drm_find_bridge(np);
-       if (!bridge)
-               return -EPROBE_DEFER;
-
-       /* Link drm_bridge to encoder */
-       return drm_simple_display_pipe_attach_bridge(&arcpgu->pipe, bridge);
-}