fixed undefined jh7110_clk_pll_debug_init when debugfs is not enabled

fixed _thread redefined as different symbol compile error fixed starfive_drm_dt_ids not defined
Fishwaldo · Jul 18, 2023 · b1d5cf3 · b1d5cf3
1 parent 765947e
commit b1d5cf3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/drivers/clk/starfive/clk-starfive-jh7110-pll.c b/drivers/clk/starfive/clk-starfive-jh7110-pll.c
@@ -280,7 +280,7 @@ static void jh7110_clk_pll_debug_init(struct clk_hw *hw,
 	debugfs_create_regset32("registers", 0400, dentry, regset);
 }
 #else
-#define jh7110_clk_debug_init NULL
+#define jh7110_clk_pll_debug_init NULL
 #endif
 
 static const struct clk_ops jh7110_clk_pll_ops = {

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
@@ -1050,7 +1050,7 @@ static bool _trigger(struct pl330_thread *thrd)
 	return true;
 }
 
-static bool _start(struct pl330_thread *thrd)
+static bool _start_thread(struct pl330_thread *thrd)
 {
 	switch (_state(thrd)) {
 	case PL330_STATE_FAULT_COMPLETING:
@@ -1702,7 +1702,7 @@ static int pl330_update(struct pl330_dmac *pl330)
 			thrd->req_running = -1;
 
 			/* Get going again ASAP */
-			_start(thrd);
+			_start_thread(thrd);
 
 			/* For now, just make a list of callbacks to be done */
 			list_add_tail(&descdone->rqd, &pl330->req_done);
@@ -2089,7 +2089,7 @@ static void pl330_tasklet(struct tasklet_struct *t)
 	} else {
 		/* Make sure the PL330 Channel thread is active */
 		spin_lock(&pch->thread->dmac->lock);
-		_start(pch->thread);
+		_start_thread(pch->thread);
 		spin_unlock(&pch->thread->dmac->lock);
 	}
 
@@ -2107,7 +2107,7 @@ static void pl330_tasklet(struct tasklet_struct *t)
 			if (power_down) {
 				pch->active = true;
 				spin_lock(&pch->thread->dmac->lock);
-				_start(pch->thread);
+				_start_thread(pch->thread);
 				spin_unlock(&pch->thread->dmac->lock);
 				power_down = false;
 			}

diff --git a/drivers/gpu/drm/i2c/tda998x_pin.c b/drivers/gpu/drm/i2c/tda998x_pin.c
@@ -23,7 +23,7 @@ static const struct of_device_id tda998x_rgb_dt_ids[] = {
 	{ .compatible = "starfive,tda998x_rgb_pin", },
 	{ /* sentinel */ },
 };
-MODULE_DEVICE_TABLE(of, starfive_drm_dt_ids);
+MODULE_DEVICE_TABLE(of, tda998x_rgb_dt_ids);
 
 static struct platform_driver starfive_drm_platform_driver = {
 	.probe = starfive_drm_platform_probe,

diff --git a/drivers/gpu/drm/verisilicon/vs_drv.c b/drivers/gpu/drm/verisilicon/vs_drv.c
@@ -10,6 +10,7 @@
 #include <linux/delay.h>
 
 #include <drm/drm_of.h>
+#include <drm/drm_device.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_probe_helper.h>