| From 10c187783fcd90715eb08de38c99757762291e08 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 9 Nov 2020 18:21:55 +0000 |
| Subject: mtd: ubi: wl: Fix a couple of kernel-doc issues |
| |
| From: Lee Jones <lee.jones@linaro.org> |
| |
| [ Upstream commit ab4e4de9fd8b469823a645f05f2c142e9270b012 ] |
| |
| Fixes the following W=1 kernel build warning(s): |
| |
| drivers/mtd/ubi/wl.c:584: warning: Function parameter or member 'nested' not described in 'schedule_erase' |
| drivers/mtd/ubi/wl.c:1075: warning: Excess function parameter 'shutdown' description in '__erase_worker' |
| |
| Cc: Richard Weinberger <richard@nod.at> |
| Cc: Miquel Raynal <miquel.raynal@bootlin.com> |
| Cc: Vignesh Raghavendra <vigneshr@ti.com> |
| Cc: linux-mtd@lists.infradead.org |
| Signed-off-by: Lee Jones <lee.jones@linaro.org> |
| Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> |
| Link: https://lore.kernel.org/linux-mtd/20201109182206.3037326-13-lee.jones@linaro.org |
| Stable-dep-of: f773f0a331d6 ("ubi: Fix deadlock caused by recursively holding work_sem") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/mtd/ubi/wl.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c |
| index 6da09263e0b9f..2ee0e60c43c2e 100644 |
| --- a/drivers/mtd/ubi/wl.c |
| +++ b/drivers/mtd/ubi/wl.c |
| @@ -575,6 +575,7 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk, |
| * @vol_id: the volume ID that last used this PEB |
| * @lnum: the last used logical eraseblock number for the PEB |
| * @torture: if the physical eraseblock has to be tortured |
| + * @nested: denotes whether the work_sem is already held in read mode |
| * |
| * This function returns zero in case of success and a %-ENOMEM in case of |
| * failure. |
| @@ -1066,8 +1067,6 @@ static int ensure_wear_leveling(struct ubi_device *ubi, int nested) |
| * __erase_worker - physical eraseblock erase worker function. |
| * @ubi: UBI device description object |
| * @wl_wrk: the work object |
| - * @shutdown: non-zero if the worker has to free memory and exit |
| - * because the WL sub-system is shutting down |
| * |
| * This function erases a physical eraseblock and perform torture testing if |
| * needed. It also takes care about marking the physical eraseblock bad if |
| -- |
| 2.39.2 |
| |
