summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/environment.c3
-rw-r--r--drivers/eeprom/at25.c3
-rw-r--r--drivers/usb/core/usb.c3
-rw-r--r--lib/parameter.c3
-rw-r--r--net/eth.c2
5 files changed, 5 insertions, 9 deletions
diff --git a/common/environment.c b/common/environment.c
index 6f06bfce28..ab82103d99 100644
--- a/common/environment.c
+++ b/common/environment.c
@@ -371,8 +371,7 @@ skip:
ret = 0;
out:
close(envfd);
- if (buf_free)
- free(buf_free);
+ free(buf_free);
return ret;
}
diff --git a/drivers/eeprom/at25.c b/drivers/eeprom/at25.c
index 68b4710aae..0a099e18b9 100644
--- a/drivers/eeprom/at25.c
+++ b/drivers/eeprom/at25.c
@@ -294,8 +294,7 @@ static int at25_probe(struct device_d *dev)
return 0;
fail:
- if (at25)
- free(at25);
+ free(at25);
return err;
}
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 68a51d1e1e..fe1ac0280a 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -504,8 +504,7 @@ int usb_host_detect(struct usb_host *host, int force)
list_del(&dev->list);
unregister_device(&dev->dev);
- if (dev->hub)
- free(dev->hub);
+ free(dev->hub);
dma_free(dev->setup_packet);
dma_free(dev->descriptor);
free(dev);
diff --git a/lib/parameter.c b/lib/parameter.c
index c5c6426bb2..a0bae3e90a 100644
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -108,8 +108,7 @@ int dev_set_param(struct device_d *dev, const char *name, const char *val)
int dev_param_set_generic(struct device_d *dev, struct param_d *p,
const char *val)
{
- if (p->value)
- free(p->value);
+ free(p->value);
if (!val) {
p->value = NULL;
return 0;
diff --git a/net/eth.c b/net/eth.c
index 37dd9e087d..cb59e76144 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -382,7 +382,7 @@ void eth_unregister(struct eth_device *edev)
dev_remove_parameters(&edev->dev);
- if (IS_ENABLED(CONFIG_OFDEVICE) && edev->nodepath)
+ if (IS_ENABLED(CONFIG_OFDEVICE))
free(edev->nodepath);
unregister_device(&edev->dev);