Re: [2.6 patch] drivers/ieee1394/csr1212.c: remove dead code

[Stefan Richter <stefanr@s5r6.in-berlin.de>]

Jody McIntyre wrote:
> --- linux.orig/drivers/ieee1394/csr1212.c
> +++ linux/drivers/ieee1394/csr1212.c
> @@ -1610,16 +1610,16 @@ int csr1212_parse_csr(struct csr1212_csr
>  	csr->root_kv->valid = 0;
>  	csr->root_kv->next = csr->root_kv;
>  	csr->root_kv->prev = csr->root_kv;
> -	csr1212_get_keyval(csr, csr->root_kv);
> +	if (_csr1212_read_keyval(csr, csr->root_kv) != CSR1212_SUCCESS)
> +		return ret;

-	csr1212_get_keyval(csr, csr->root_kv);
+	ret = _csr1212_read_keyval(csr, csr->root_kv);
+	if (ret != CSR1212_SUCCESS)
+		return ret;

>  
>  	/* Scan through the Root directory finding all extended ROM regions
>  	 * and make cache regions for them */
>  	for (dentry = csr->root_kv->value.directory.dentries_head;
>  	     dentry; dentry = dentry->next) {
>  		if (dentry->kv->key.id == CSR1212_KV_ID_EXTENDED_ROM) {
> -			csr1212_get_keyval(csr, dentry->kv);
> -
> -			if (ret != CSR1212_SUCCESS)
> +			if (_csr1212_read_keyval(csr, dentry->kv) !=
> +						CSR1212_SUCCESS)
>  				return ret;
>  		}
>  	}

-		if (dentry->kv->key.id == CSR1212_KV_ID_EXTENDED_ROM) {
-			csr1212_get_keyval(csr, dentry->kv);
-
+		if (dentry->kv->key.id == CSR1212_KV_ID_EXTENDED_ROM &&
+		    !dentry->kv->valid) {
+			ret = _csr1212_read_keyval(csr, dentry->kv);
 			if (ret != CSR1212_SUCCESS)
 				return ret;
 		}


Although I am not quite sure if the check for !valid is really required. 
It certainly cannot hurt.
--
Stefan Richter
-=====-=-=-= =-== =-=-=
http://arcgraph.de/sr/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/