diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-08-31 02:06:38 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-08-31 02:06:38 +0300 |
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/mtd/nand/raw/oxnas_nand.c | |
| parent | 07b4c950f27bef0362dc6ad7ee713aab61d58149 (diff) | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
| download | linux-1ac731c529cd4d6adbce134754b51ff7d822b145.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'drivers/mtd/nand/raw/oxnas_nand.c')
| -rw-r--r-- | drivers/mtd/nand/raw/oxnas_nand.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mtd/nand/raw/oxnas_nand.c b/drivers/mtd/nand/raw/oxnas_nand.c index cd112d45e0b5..e3c9807df1cd 100644 --- a/drivers/mtd/nand/raw/oxnas_nand.c +++ b/drivers/mtd/nand/raw/oxnas_nand.c @@ -171,7 +171,7 @@ err_clk_unprepare: return err; } -static int oxnas_nand_remove(struct platform_device *pdev) +static void oxnas_nand_remove(struct platform_device *pdev) { struct oxnas_nand_ctrl *oxnas = platform_get_drvdata(pdev); struct nand_chip *chip; @@ -184,8 +184,6 @@ static int oxnas_nand_remove(struct platform_device *pdev) } clk_disable_unprepare(oxnas->clk); - - return 0; } static const struct of_device_id oxnas_nand_match[] = { @@ -196,7 +194,7 @@ MODULE_DEVICE_TABLE(of, oxnas_nand_match); static struct platform_driver oxnas_nand_driver = { .probe = oxnas_nand_probe, - .remove = oxnas_nand_remove, + .remove_new = oxnas_nand_remove, .driver = { .name = "oxnas_nand", .of_match_table = oxnas_nand_match, |