From: Badhri Jagan Sridharan <Badhri@google.com>
Date: Mon, 28 Mar 2016 21:41:21 +0000 (-0700)
Subject: ANDROID: dm: Minor cleanup
X-Git-Tag: firefly_0821_release~176^2~348
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d7b095701b5ce9199df6f5b7436a8c7825ce282d;p=firefly-linux-kernel-4.4.55.git

ANDROID: dm: Minor cleanup

Compacts the linear device arguments removing the
unnecessary variables.

Bug: 27175947
Change-Id: I157170eebe3c0f89a68ae05870a1060f188d0da0
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
---

diff --git a/drivers/md/dm-android-verity.c b/drivers/md/dm-android-verity.c
index db4ddf789a39..f6ddbee5e2d3 100644
--- a/drivers/md/dm-android-verity.c
+++ b/drivers/md/dm-android-verity.c
@@ -572,13 +572,10 @@ static inline bool test_mult_overflow(sector_t a, u32 b)
 static int add_as_linear_device(struct dm_target *ti, char *dev)
 {
 	/*Move to linear mapping defines*/
-	char *linear_table_args[DM_LINEAR_ARGS];
-	char offset[]  = "0";
+	char *linear_table_args[DM_LINEAR_ARGS] = {dev,
+					DM_LINEAR_TARGET_OFFSET};
 	int err = 0;
 
-	linear_table_args[0] = dev;
-	linear_table_args[1] = offset;
-
 	android_verity_target.dtr = linear_target.dtr,
 	android_verity_target.map = linear_target.map,
 	android_verity_target.status = linear_target.status,
diff --git a/drivers/md/dm-android-verity.h b/drivers/md/dm-android-verity.h
index 2cf7de1b7910..fe53863c664b 100644
--- a/drivers/md/dm-android-verity.h
+++ b/drivers/md/dm-android-verity.h
@@ -46,6 +46,8 @@
 #define DM_MSG_PREFIX                   "android-verity"
 
 #define DM_LINEAR_ARGS 2
+#define DM_LINEAR_TARGET_OFFSET "0"
+
 /*
  * There can be two formats.
  * if fec is present