diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-07-17 19:20:46 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-07-17 19:20:46 +0300 |
| commit | 50501936288d6a29d7ef78f25d00e33240fad45f (patch) | |
| tree | ad5fe10a0eaa868c35cc52682fd2b4a0ebb4ccec /drivers/clk/hisilicon/clk-hi3559a.c | |
| parent | 677232f879f2464007c511a73048ff5996b479fc (diff) | |
| parent | 6995e2de6891c724bfeb2db33d7b87775f913ad1 (diff) | |
| download | linux-50501936288d6a29d7ef78f25d00e33240fad45f.tar.xz | |
Merge tag 'v6.4' into next
Sync up with mainline to bring in updates to shared infrastructure.
Diffstat (limited to 'drivers/clk/hisilicon/clk-hi3559a.c')
| -rw-r--r-- | drivers/clk/hisilicon/clk-hi3559a.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/clk/hisilicon/clk-hi3559a.c b/drivers/clk/hisilicon/clk-hi3559a.c index 9ea1a80acbe8..ce4028102bc2 100644 --- a/drivers/clk/hisilicon/clk-hi3559a.c +++ b/drivers/clk/hisilicon/clk-hi3559a.c @@ -810,18 +810,17 @@ static int hi3559av100_crg_probe(struct platform_device *pdev) return 0; } -static int hi3559av100_crg_remove(struct platform_device *pdev) +static void hi3559av100_crg_remove(struct platform_device *pdev) { struct hisi_crg_dev *crg = platform_get_drvdata(pdev); hisi_reset_exit(crg->rstc); crg->funcs->unregister_clks(pdev); - return 0; } static struct platform_driver hi3559av100_crg_driver = { .probe = hi3559av100_crg_probe, - .remove = hi3559av100_crg_remove, + .remove_new = hi3559av100_crg_remove, .driver = { .name = "hi3559av100-clock", .of_match_table = hi3559av100_crg_match_table, @@ -841,5 +840,4 @@ static void __exit hi3559av100_crg_exit(void) module_exit(hi3559av100_crg_exit); -MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("HiSilicon Hi3559AV100 CRG Driver"); |