block/partitions/ldm: Remove redundant assignments

[linux-2.6-microblaze.git] / block / partitions / ldm.c

diff --git a/block/partitions/ldm.c b/block/partitions/ldm.c
index 27f6c7d..38e5896 100644 (file)
--- a/block/partitions/ldm.c
+++ b/block/partitions/ldm.c
@@ -736,7 +736,6 @@ static bool ldm_parse_cmp3 (const u8 *buffer, int buflen, struct vblk *vb)
                len = r_cols;
        } else {
                r_stripe = 0;
-               r_cols   = 0;
                len = r_parent;
        }
        if (len < 0)
@@ -783,11 +782,8 @@ static int ldm_parse_dgr3 (const u8 *buffer, int buflen, struct vblk *vb)
                r_id1 = ldm_relative (buffer, buflen, 0x24, r_diskid);
                r_id2 = ldm_relative (buffer, buflen, 0x24, r_id1);
                len = r_id2;
-       } else {
-               r_id1 = 0;
-               r_id2 = 0;
+       } else
                len = r_diskid;
-       }
        if (len < 0)
                return false;
 
@@ -826,11 +822,8 @@ static bool ldm_parse_dgr4 (const u8 *buffer, int buflen, struct vblk *vb)
                r_id1 = ldm_relative (buffer, buflen, 0x44, r_name);
                r_id2 = ldm_relative (buffer, buflen, 0x44, r_id1);
                len = r_id2;
-       } else {
-               r_id1 = 0;
-               r_id2 = 0;
+       } else
                len = r_name;
-       }
        if (len < 0)
                return false;
 
@@ -963,10 +956,8 @@ static bool ldm_parse_prt3(const u8 *buffer, int buflen, struct vblk *vb)
                        return false;
                }
                len = r_index;
-       } else {
-               r_index = 0;
+       } else
                len = r_diskid;
-       }
        if (len < 0) {
                ldm_error("len %d < 0", len);
                return false;