diff options
| author | Laurentiu Tudor <laurentiu.tudor@nxp.com> | 2017-06-08 17:28:48 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-13 13:14:12 +0300 |
| commit | a042fbed02904493ae6df26ec836045f5a7d3ce2 (patch) | |
| tree | 282cd88f6a1fbae1d72a2d2a1dcac2b97b35d39c | |
| parent | 72f3415f812c12b8dfb05996514d1248c213250c (diff) | |
| download | linux-a042fbed02904493ae6df26ec836045f5a7d3ce2.tar.xz | |
staging: fsl-mc: simplify couple of deallocations
Simplify a couple of deallocations code paths. This also fixes these
checkpatch.pl false positives:
"WARNING: kfree(NULL) is safe and this check is probably not required"
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c index 50eb41588a65..7b48ade1ca9c 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c @@ -420,15 +420,11 @@ bool fsl_mc_is_root_dprc(struct device *dev) static void fsl_mc_device_release(struct device *dev) { struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); - struct fsl_mc_bus *mc_bus = NULL; kfree(mc_dev->regions); if (strcmp(mc_dev->obj_desc.type, "dprc") == 0) - mc_bus = to_fsl_mc_bus(mc_dev); - - if (mc_bus) - kfree(mc_bus); + kfree(to_fsl_mc_bus(mc_dev)); else kfree(mc_dev); } @@ -559,10 +555,8 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, error_cleanup_dev: kfree(mc_dev->regions); - if (mc_bus) - kfree(mc_bus); - else - kfree(mc_dev); + kfree(mc_bus); + kfree(mc_dev); return error; } |