[PATCH 01/14] remove redundant NULL check on free

Lucas Stach dev at lynxeye.de
Fri Feb 7 03:48:43 EST 2014


free() already checks the pointer to be non
NULL. No need to do it again.

Signed-off-by: Lucas Stach <dev at lynxeye.de>
---
 common/environment.c   | 3 +--
 drivers/eeprom/at25.c  | 3 +--
 drivers/usb/core/usb.c | 3 +--
 lib/parameter.c        | 3 +--
 net/eth.c              | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/common/environment.c b/common/environment.c
index 6f06bfc..ab82103 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 68b4710..0a099e1 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 68a51d1..fe1ac02 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 c5c6426..a0bae3e 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 37dd9e0..cb59e76 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);
-- 
1.8.5.3




More information about the barebox mailing list