From a7adce905acfa188e1fdd926278331f6ff801dcb Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 24 Nov 2008 16:59:25 +0000
Subject: [PATCH] Merge both GL518 entries into one. We don't need separate
 entries as both revisions are handled by the same driver anyway.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5423 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 prog/detect/sensors-detect | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 08491bc2..5305788b 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -812,16 +812,10 @@ use vars qw(@i2c_adapter_names);
        i2c_detect => sub { w83l785ts_detect(@_); },
      },
      {
-       name => "Genesys Logic GL518SM Revision 0x00",
+       name => "Genesys Logic GL518SM",
        driver => "gl518sm",
        i2c_addrs => [0x2c, 0x2d],
-       i2c_detect => sub { gl518sm_detect(@_, 0); },
-     },
-     {
-       name => "Genesys Logic GL518SM Revision 0x80",
-       driver => "gl518sm",
-       i2c_addrs => [0x2c, 0x2d],
-       i2c_detect => sub { gl518sm_detect(@_, 1); },
+       i2c_detect => sub { gl518sm_detect(@_); },
      },
      {
        name => "Genesys Logic GL520SM",
@@ -4366,7 +4360,6 @@ sub mozart_detect
   return 5;
 }
 
-# Chip to detect: 0 = Revision 0x00, 1 = Revision 0x80
 # Registers used:
 #   0x00: Device ID
 #   0x01: Revision ID
@@ -4374,13 +4367,12 @@ sub mozart_detect
 # Mediocre detection
 sub gl518sm_detect
 {
-  my ($file, $addr, $chip) = @_;
+  my ($file, $addr) = @_;
   my $reg;
   return unless i2c_smbus_read_byte_data($file, 0x00) == 0x80;
   return unless (i2c_smbus_read_byte_data($file, 0x03) & 0x80) == 0x00;
   $reg = i2c_smbus_read_byte_data($file, 0x01);
-  return unless ($chip == 0 and $reg == 0x00) or
-                ($chip == 1 and $reg == 0x80);
+  return unless $reg == 0x00 or $reg == 0x80;
   return (6);
 }