Skip to content

Commit b1d5cf3

Browse files
rootSIGSEGV111
authored andcommitted
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
1 parent 765947e commit b1d5cf3

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

drivers/clk/starfive/clk-starfive-jh7110-pll.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ static void jh7110_clk_pll_debug_init(struct clk_hw *hw,
280280
debugfs_create_regset32("registers", 0400, dentry, regset);
281281
}
282282
#else
283-
#define jh7110_clk_debug_init NULL
283+
#define jh7110_clk_pll_debug_init NULL
284284
#endif
285285

286286
static const struct clk_ops jh7110_clk_pll_ops = {

drivers/dma/pl330.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ static bool _trigger(struct pl330_thread *thrd)
10501050
return true;
10511051
}
10521052

1053-
static bool _start(struct pl330_thread *thrd)
1053+
static bool _start_thread(struct pl330_thread *thrd)
10541054
{
10551055
switch (_state(thrd)) {
10561056
case PL330_STATE_FAULT_COMPLETING:
@@ -1702,7 +1702,7 @@ static int pl330_update(struct pl330_dmac *pl330)
17021702
thrd->req_running = -1;
17031703

17041704
/* Get going again ASAP */
1705-
_start(thrd);
1705+
_start_thread(thrd);
17061706

17071707
/* For now, just make a list of callbacks to be done */
17081708
list_add_tail(&descdone->rqd, &pl330->req_done);
@@ -2089,7 +2089,7 @@ static void pl330_tasklet(struct tasklet_struct *t)
20892089
} else {
20902090
/* Make sure the PL330 Channel thread is active */
20912091
spin_lock(&pch->thread->dmac->lock);
2092-
_start(pch->thread);
2092+
_start_thread(pch->thread);
20932093
spin_unlock(&pch->thread->dmac->lock);
20942094
}
20952095

@@ -2107,7 +2107,7 @@ static void pl330_tasklet(struct tasklet_struct *t)
21072107
if (power_down) {
21082108
pch->active = true;
21092109
spin_lock(&pch->thread->dmac->lock);
2110-
_start(pch->thread);
2110+
_start_thread(pch->thread);
21112111
spin_unlock(&pch->thread->dmac->lock);
21122112
power_down = false;
21132113
}

drivers/gpu/drm/i2c/tda998x_pin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ static const struct of_device_id tda998x_rgb_dt_ids[] = {
2323
{ .compatible = "starfive,tda998x_rgb_pin", },
2424
{ /* sentinel */ },
2525
};
26-
MODULE_DEVICE_TABLE(of, starfive_drm_dt_ids);
26+
MODULE_DEVICE_TABLE(of, tda998x_rgb_dt_ids);
2727

2828
static struct platform_driver starfive_drm_platform_driver = {
2929
.probe = starfive_drm_platform_probe,

drivers/gpu/drm/verisilicon/vs_drv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/delay.h>
1111

1212
#include <drm/drm_of.h>
13+
#include <drm/drm_device.h>
1314
#include <drm/drm_crtc.h>
1415
#include <drm/drm_crtc_helper.h>
1516
#include <drm/drm_probe_helper.h>

0 commit comments

Comments
 (0)