From 7634633ccd98b1fa7fd9e9b47708427ed28730fc Mon Sep 17 00:00:00 2001
From: Giel van Schijndel <me@mortis.eu>
Date: Thu, 27 May 2010 19:58:42 +0200
Subject: [PATCH] --- yaml --- r: 199039 b: refs/heads/master c:
 bd328acdc6160b95f5d7127a9df3172892f35627 h: refs/heads/master i:   199037:
 141ab71245f46c43652cda100c8feba8376ac72b   199035:
 81060e4ffe209dc8b8cee407255a717b14f2cddb   199031:
 ece4f2723b0645bbcc885e9c4ebba4e07c2ba331   199023:
 ada8e9fd3b2c578d2d18f28cbb377d2d8a805383   199007:
 81ea2a8563c3377e4b9e1856cab62bf10ae70f07   198975:
 30fdb7bb524743eb9a4b2c5a7d1f6a5f579152e8   198911:
 fb2ced2b16091fa622564d81416a1574e10e40a9 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/hwmon/f71882fg.c | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 76ef296cbcb9..ac17a639f6c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8a4eacaa93853f977b0420ca42c471d528f93af
+refs/heads/master: bd328acdc6160b95f5d7127a9df3172892f35627
diff --git a/trunk/drivers/hwmon/f71882fg.c b/trunk/drivers/hwmon/f71882fg.c
index 4230729780c4..ca34e5c48702 100644
--- a/trunk/drivers/hwmon/f71882fg.c
+++ b/trunk/drivers/hwmon/f71882fg.c
@@ -856,10 +856,8 @@ static inline int superio_inb(int base, int reg)
 static int superio_inw(int base, int reg)
 {
 	int val;
-	outb(reg++, base);
-	val = inb(base + 1) << 8;
-	outb(reg, base);
-	val |= inb(base + 1);
+	val  = superio_inb(base, reg) << 8;
+	val |= superio_inb(base, reg + 1);
 	return val;
 }
 
@@ -905,10 +903,8 @@ static u16 f71882fg_read16(struct f71882fg_data *data, u8 reg)
 {
 	u16 val;
 
-	outb(reg++, data->addr + ADDR_REG_OFFSET);
-	val = inb(data->addr + DATA_REG_OFFSET) << 8;
-	outb(reg, data->addr + ADDR_REG_OFFSET);
-	val |= inb(data->addr + DATA_REG_OFFSET);
+	val  = f71882fg_read8(data, reg) << 8;
+	val |= f71882fg_read8(data, reg + 1);
 
 	return val;
 }
@@ -921,10 +917,8 @@ static void f71882fg_write8(struct f71882fg_data *data, u8 reg, u8 val)
 
 static void f71882fg_write16(struct f71882fg_data *data, u8 reg, u16 val)
 {
-	outb(reg++, data->addr + ADDR_REG_OFFSET);
-	outb(val >> 8, data->addr + DATA_REG_OFFSET);
-	outb(reg, data->addr + ADDR_REG_OFFSET);
-	outb(val & 255, data->addr + DATA_REG_OFFSET);
+	f71882fg_write8(data, reg,     val >> 8);
+	f71882fg_write8(data, reg + 1, val & 0xff);
 }
 
 static u16 f71882fg_read_temp(struct f71882fg_data *data, int nr)