2020-09-19 09:51:48

by Liu Shixin

Subject: [PATCH -next] mtd: vmu-flash: simplify the return expression of probe_maple_vmu

Simplify the return expression.

Signed-off-by: Liu Shixin <[email protected]>
---
drivers/mtd/maps/vmu-flash.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/mtd/maps/vmu-flash.c b/drivers/mtd/maps/vmu-flash.c
index 177bf134e189..588e82de581c 100644
--- a/drivers/mtd/maps/vmu-flash.c
+++ b/drivers/mtd/maps/vmu-flash.c
@@ -772,7 +772,6 @@ static void vmu_file_error(struct maple_device *mdev, void *recvbuf)

static int probe_maple_vmu(struct device *dev)
{
- int error;
struct maple_device *mdev = to_maple_dev(dev);
struct maple_driver *mdrv = to_maple_driver(dev->driver);

@@ -780,11 +779,7 @@ static int probe_maple_vmu(struct device *dev)
mdev->fileerr_handler = vmu_file_error;
mdev->driver = mdrv;

- error = vmu_connect(mdev);
- if (error)
- return error;
-
- return 0;
+ return vmu_connect(mdev);
}

static int remove_maple_vmu(struct device *dev)
--
2.25.1

2020-10-02 07:20:09

by Miquel Raynal

Subject: Re: [PATCH -next] mtd: vmu-flash: simplify the return expression of probe_maple_vmu

On Sat, 2020-09-19 at 10:08:54 UTC, Liu Shixin wrote:
> Simplify the return expression.
>
> Signed-off-by: Liu Shixin <[email protected]>

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.

Miquel