From owner-svn-src-head@FreeBSD.ORG  Sun May 29 19:53:46 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 961271065782;
	Sun, 29 May 2011 19:53:46 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 86C4A8FC1D;
	Sun, 29 May 2011 19:53:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4TJrk8W044122;
	Sun, 29 May 2011 19:53:46 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4TJrkAt044120;
	Sun, 29 May 2011 19:53:46 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201105291953.p4TJrkAt044120@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 29 May 2011 19:53:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222461 - head/sys/dev/iicbus
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 May 2011 19:53:46 -0000

Author: nwhitehorn
Date: Sun May 29 19:53:46 2011
New Revision: 222461
URL: http://svn.freebsd.org/changeset/base/222461

Log:
  Move the celsius-to-kelvin conversion to a place that powermac_thermal can
  see it as well.

Modified:
  head/sys/dev/iicbus/max6690.c

Modified: head/sys/dev/iicbus/max6690.c
==============================================================================
--- head/sys/dev/iicbus/max6690.c	Sun May 29 19:53:11 2011	(r222460)
+++ head/sys/dev/iicbus/max6690.c	Sun May 29 19:53:46 2011	(r222461)
@@ -329,7 +329,7 @@ max6690_sensor_read(struct max6690_senso
 	*/
 	temp = (integer * 10) + (fraction >> 5) * 10 / 8;
 
-	return (temp);
+	return (temp + FCU_ZERO_C_TO_K);
 }
 
 static int
@@ -338,7 +338,6 @@ max6690_sensor_sysctl(SYSCTL_HANDLER_ARG
 	device_t dev;
 	struct max6690_softc *sc;
 	struct max6690_sensor *sens;
-	int value = 0;
 	int error;
 	unsigned int temp;
 
@@ -346,12 +345,10 @@ max6690_sensor_sysctl(SYSCTL_HANDLER_ARG
 	sc = device_get_softc(dev);
 	sens = &sc->sc_sensors[arg2];
 
-	value = max6690_sensor_read(sens);
-	if (value < 0)
+	temp = max6690_sensor_read(sens);
+	if (temp < 0)
 		return (EIO);
 
-	temp = value + FCU_ZERO_C_TO_K;
-
 	error = sysctl_handle_int(oidp, &temp, 0, req);
 
 	return (error);