From 9dbd13a1f2c21e2e0ebe339110019c7013f4de32 Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Fri, 21 Dec 2012 16:42:36 +0000
Subject: [PATCH] Remove duplicate "ns" in SDR timings.

git-svn-id: http://lm-sensors.org/svn/i2c-tools/branches/i2c-tools-3.1@6108 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES             | 1 +
 eeprom/decode-dimms | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index b830525..e4d172c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ SVN HEAD
                 Decode bus width extension of DDR3 SDRAM
                 Don't choke when no EEPROM is found
                 Update manufacturer IDs
+                Remove duplicate "ns" in SDR timings
   i2c-dev.h: Minimize differences with kernel flavor
              Move SMBus helper functions to include/i2c/smbus.h
   i2c-stub-from-dump: Be more tolerant on input dump format
diff --git a/eeprom/decode-dimms b/eeprom/decode-dimms
index 4aa953d..ec47e88 100755
--- a/eeprom/decode-dimms
+++ b/eeprom/decode-dimms
@@ -629,7 +629,7 @@ sub decode_sdr_sdram($)
 	my $ctime = ($bytes->[9] >> 4) + ($bytes->[9] & 0xf) * 0.1;
 
 	$trcd = $bytes->[29];
-	$trp = $bytes->[27];;
+	$trp = $bytes->[27];
 	$tras = $bytes->[30];
 
 	printl("tCL-tRCD-tRP-tRAS",
@@ -726,7 +726,6 @@ sub decode_sdr_sdram($)
 		else {
 			$temp += 15 if $temp < 4;
 			$temp += ($bytes->[23] & 0xf) * 0.1;
-			$temp .= " ns";
 		}
 		$cycle_time .= "\n$temp ns at CAS ".$cas[$#cas-1];
 
@@ -735,7 +734,6 @@ sub decode_sdr_sdram($)
 		else {
 			$temp += 15 if $temp < 4;
 			$temp += ($bytes->[24] & 0xf) * 0.1;
-			$temp .= " ns";
 		}
 		$access_time .= "\n$temp ns at CAS ".$cas[$#cas-1];
 	}
@@ -745,7 +743,6 @@ sub decode_sdr_sdram($)
 		if ($temp == 0) { $temp = "Undefined!"; }
 		else {
 			$temp += ($bytes->[25] & 0x3) * 0.25;
-			$temp .= " ns";
 		}
 		$cycle_time .= "\n$temp ns at CAS ".$cas[$#cas-2];
 
@@ -753,7 +750,6 @@ sub decode_sdr_sdram($)
 		if ($temp == 0) { $temp = "Undefined!"; }
 		else {
 			$temp += ($bytes->[26] & 0x3) * 0.25;
-			$temp .= " ns";
 		}
 		$access_time .= "\n$temp ns at CAS ".$cas[$#cas-2];
 	}