osmith has uploaded this change for review.

View Change

drivers/dahdi: fix always true cond

Remvoe these checks as they are not useful. For example, wc->xb gets
allocated together with wc. With these removed, the code behaves the
same as before.

Fix for these warnings with current linux master:

wcte43x-base.c: In function 't43x_init_one':
wcte43x-base.c:3517:13: warning: the comparison will always evaluate as 'true' for the address of 'xb' will never be NULL [-Waddress]
 3517 |         if (&wc->xb)
      |             ^
wcte43x-base.c:141:21: note: 'xb' declared here
  141 |         struct wcxb xb;
      |                     ^~

xpp/xbus-core.c: In function 'xbus_check_unique':
xpp/xbus-core.c:116:13: warning: the comparison will always evaluate as 'true' for the address of 'label' will never be NULL [-Waddress]
  116 |         if (xbus->label && *(xbus->label)) {
      |             ^~~~

etc.

Change-Id: I33ee446a32de3bb8d9fe966a2989994bf4bbd806
---
M drivers/dahdi/dahdi-base.c
M drivers/dahdi/dahdi_dynamic_ethmf.c
M drivers/dahdi/wcte13xp-base.c
M drivers/dahdi/wcte43x-base.c
M drivers/dahdi/xpp/xbus-core.c
5 files changed, 7 insertions(+), 15 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/93/39593/1

diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index 43948bd..0aa1de7 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -952,12 +952,8 @@
 	if (!s)
 		return -ENODEV;
 
-	if (s->name)
-		seq_printf(sfile, "Span %d: %s ", s->spanno, s->name);
-	if (s->desc)
-		seq_printf(sfile, "\"%s\"", s->desc);
-	else
-		seq_printf(sfile, "\"\"");
+	seq_printf(sfile, "Span %d: %s ", s->spanno, s->name);
+	seq_printf(sfile, "\"%s\"", s->desc);
 
 	if (dahdi_is_sync_master(s))
 		seq_printf(sfile, " (MASTER)");
@@ -993,9 +989,7 @@
 	for (x = 0; x < s->channels; x++) {
 		struct dahdi_chan *chan = s->chans[x];
 
-		if (chan->name)
-			seq_printf(sfile, "\t%4d %s ", chan->channo,
-					chan->name);
+		seq_printf(sfile, "\t%4d %s ", chan->channo, chan->name);
 
 		if (chan->sig) {
 			if (chan->sig == DAHDI_SIG_SLAVE)
diff --git a/drivers/dahdi/dahdi_dynamic_ethmf.c b/drivers/dahdi/dahdi_dynamic_ethmf.c
index f98280c..998d962 100644
--- a/drivers/dahdi/dahdi_dynamic_ethmf.c
+++ b/drivers/dahdi/dahdi_dynamic_ethmf.c
@@ -535,7 +535,7 @@
 		kfree(z->msgbuf);
 		kfree(z);
 	} else {
-		if (z && z->span && z->span->name) {
+		if (z && z->span) {
 			printk(KERN_ERR "Cannot find interface for %s\n",
 				z->span->name);
 		}
diff --git a/drivers/dahdi/wcte13xp-base.c b/drivers/dahdi/wcte13xp-base.c
index cfbdd4a..8ceee67 100644
--- a/drivers/dahdi/wcte13xp-base.c
+++ b/drivers/dahdi/wcte13xp-base.c
@@ -2701,8 +2701,7 @@
 	return 0;
 
 fail_exit:
-	if (&wc->xb)
-		wcxb_release(&wc->xb);
+	wcxb_release(&wc->xb);
 
 	free_wc(wc);
 	return res;
diff --git a/drivers/dahdi/wcte43x-base.c b/drivers/dahdi/wcte43x-base.c
index d164a69..0c7fbaf 100644
--- a/drivers/dahdi/wcte43x-base.c
+++ b/drivers/dahdi/wcte43x-base.c
@@ -3514,8 +3514,7 @@
 	return 0;
 
 fail_exit:
-	if (&wc->xb)
-		wcxb_release(&wc->xb);
+	wcxb_release(&wc->xb);
 
 	if (debug)
 		dev_info(&wc->xb.pdev->dev, "***At fail_exit in init_one***\n");
diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c
index e08e2d6..8514d1e 100644
--- a/drivers/dahdi/xpp/xbus-core.c
+++ b/drivers/dahdi/xpp/xbus-core.c
@@ -113,7 +113,7 @@
 {
 	if (!xbus)
 		return -ENOENT;
-	if (xbus->label && *(xbus->label)) {
+	if (xbus->label) {
 		xbus_t *xbus_old;
 
 		XBUS_DBG(DEVICES, xbus, "Checking LABEL='%s'\n", xbus->label);

To view, visit change 39593. To unsubscribe, or for help writing mail filters, visit settings.