---

yaml --- r: 113791 b: refs/heads/master c: e9fae18 h: refs/heads/master i: 113789: df4d5ce 113787: 4a5d3ce 113783: 960d036 113775: fe86661 113759: 7165376 113727: f35b0bc 113663: e6a0e50 v: v3
git-mirror · Oct 13, 2008 · 6eb1a0c · 6eb1a0c
1 parent 26fe349
commit 6eb1a0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46aa04f9b678d1d6f3558429109326775ca87715
+refs/heads/master: e9fae189caae7c1cf306e30f5b67c6d226ed69cf
diff --git a/trunk/arch/blackfin/kernel/bfin_gpio.c b/trunk/arch/blackfin/kernel/bfin_gpio.c
@@ -238,7 +238,7 @@ static void gpio_error(unsigned gpio)
 
 static void set_label(unsigned short ident, const char *label)
 {
-	if (label && str_ident) {
+	if (label) {
 		strncpy(str_ident[ident].name, label,
 			 RESOURCE_LABEL_SIZE);
 		str_ident[ident].name[RESOURCE_LABEL_SIZE - 1] = 0;
@@ -247,9 +247,6 @@ static void set_label(unsigned short ident, const char *label)
 
 static char *get_label(unsigned short ident)
 {
-	if (!str_ident)
-		return "UNKNOWN";
-
 	return (*str_ident[ident].name ? str_ident[ident].name : "UNKNOWN");
 }
 
@@ -260,7 +257,7 @@ static int cmp_label(unsigned short ident, const char *label)
 		printk(KERN_ERR "Please provide none-null label\n");
 	}
 
-	if (label && str_ident)
+	if (label)
 		return strncmp(str_ident[ident].name,
 				 label, strlen(label));
 	else