mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <dev@lynxeye.de>
To: barebox@lists.infradead.org
Subject: [PATCH 01/14] remove redundant NULL check on free
Date: Fri,  7 Feb 2014 09:48:43 +0100	[thread overview]
Message-ID: <1391762936-2747-2-git-send-email-dev@lynxeye.de> (raw)
In-Reply-To: <1391762936-2747-1-git-send-email-dev@lynxeye.de>

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

Signed-off-by: Lucas Stach <dev@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


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2014-02-07  8:48 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-07  8:48 [PATCH 00/14] Smatch warning fixups Lucas Stach
2014-02-07  8:48 ` Lucas Stach [this message]
2014-02-07  8:48 ` [PATCH 02/14] commands: edit: properly propagate error code Lucas Stach
2014-02-07  8:48 ` [PATCH 03/14] common: env: " Lucas Stach
2014-02-07  8:48 ` [PATCH 04/14] clk: imx: unsigned mfn is never less than zero Lucas Stach
2014-02-07  8:48 ` [PATCH 05/14] lib: math: fix return path (numstack may be NULL) Lucas Stach
2014-02-07  8:48 ` [PATCH 06/14] lib: libbb: f should never be NULL Lucas Stach
2014-02-07  8:48 ` [PATCH 07/14] comamnds: uimage: actually print error message Lucas Stach
2014-02-07  9:22   ` Uwe Kleine-König
2014-02-07  8:48 ` [PATCH 08/14] usb: ulpi: fix logic-op Lucas Stach
2014-02-07  8:48 ` [PATCH 09/14] usb: dfu: fix error path to avoid NULL ptr deref Lucas Stach
2014-02-07  8:48 ` [PATCH 10/14] net: usb: smsc95xx: fix wrong phy reset condition Lucas Stach
2014-02-07  8:48 ` [PATCH 11/14] net: usb: asix: properly propagate error code Lucas Stach
2014-02-07  8:48 ` [PATCH 12/14] mtd: core: avoid possible NULL ptr deref Lucas Stach
2014-02-07  8:48 ` [PATCH 13/14] clk: " Lucas Stach
2014-02-07  8:48 ` [PATCH 14/14] don't cast negative error codes to unsigned size_t Lucas Stach
2014-02-07  9:17   ` Juergen Beisert
2014-02-10  7:51 ` [PATCH 00/14] Smatch warning fixups Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1391762936-2747-2-git-send-email-dev@lynxeye.de \
    --to=dev@lynxeye.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox