Skip to contentSkip to conversation

staging: dgap: remove bogus null test in dgap_tty_init()

PATCH In review Daeseok Youn 1 participant 1 message Jun 2, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 3/6 staging: dgap: remove bogus null test in dgap_tty_init()

- The channels array were set to NULL in dgap_found_board().
- Removes redundant null check for channels array in for loop, if one of the channel cannot be allocated, dgap_tty_init() just returns an error.

---
 drivers/staging/dgap/dgap.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)
drivers/staging/dgap/dgap.c +4 -9
index 5556a6e..fcfa061 100644
@@ -1379,12 +1379,10 @@ static int dgap_tty_init(struct board_t *brd)
 	 * when the driver was first loaded.
 	 */
 	for (i = 0; i < brd->nasync; i++) {
-		if (!brd->channels[i]) {
-			brd->channels[i] =
-				kzalloc(sizeof(struct channel_t), GFP_KERNEL);
-			if (!brd->channels[i])
-				return -ENOMEM;
-		}
+		brd->channels[i] =
+			kzalloc(sizeof(struct channel_t), GFP_KERNEL);
+		if (!brd->channels[i])
+			return -ENOMEM;
 	}
 
 	ch = brd->channels[0];
@@ -1398,9 +1396,6 @@ static int dgap_tty_init(struct board_t *brd)
 	/* Set up channel variables */
 	for (i = 0; i < brd->nasync; i++, ch = brd->channels[i], bs++) {
 
-		if (!brd->channels[i])
-			continue;
-
 		spin_lock_init(&ch->ch_lock);
 
 		/* Store all our magic numbers */
Signature · 1 line
1.7.1